Merge branch 'up-master'

pwnlandia · Nov 1, 2019 · 1ec2e24 · 1ec2e24
2 parents bd9f67e + f6293bb
commit 1ec2e24
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ honeypot technologies, including [Snort](https://snort.org/),
 
 For questions regarding troubleshooting your installation, please review the
 [MHN Troubleshooting
-Guide](https://github.com/Pwnlandia/mhn/wiki/MHN-Troubleshooting-Guide),
+Guide](https://github.com/pwnlandia/mhn/wiki/MHN-Troubleshooting-Guide),
 search past questions on the [modern-honey-network Google
 Group](https://groups.google.com/forum/#!forum/modern-honey-network), or send
 emails to <[email protected]>.
@@ -45,7 +45,7 @@ Install Git
 Install MHN
 
     $ cd /opt/
-    $ sudo git clone https://github.com/Pwnlandia/mhn.git
+    $ sudo git clone https://github.com/pwnlandia/mhn.git
     $ cd mhn/
 
 Run the following script to complete the installation.  While this script runs,
@@ -97,12 +97,12 @@ services running on your MHN server.  See below for checking these.
 ### Running MHN Behind a Proxy
 
 For directions on running MHN behind a web proxy, follow the directions in the
-[wiki.](https://github.com/Pwnlandia/mhn/wiki/Running-MHN-Behind-a-Web-Proxy)
+[wiki.](https://github.com/pwnlandia/mhn/wiki/Running-MHN-Behind-a-Web-Proxy)
 
 ### Running MHN Over HTTPS
 
 By default MHN will run without HTTPS, to configure your installation to use SSL
-certificates directions can be found in the [wiki.](https://github.com/Pwnlandia/mhn/wiki/Running-MHN-Over-HTTPS)
+certificates directions can be found in the [wiki.](https://github.com/pwnlandia/mhn/wiki/Running-MHN-Over-HTTPS)
 
 ### Running MHN with Docker
 
@@ -153,7 +153,7 @@ steps for deploying a honeypot with MHN:
 5. Login to a honeypot server and run this command as root.
 
 If the deploy script successfully completes you should see the new sensor listed
-under your deployed sensor list. For a full list of supported sensors, check the list here: [List of Supported Sensors](https://github.com/Pwnlandia/mhn/wiki/List-of-Supported-Sensors)
+under your deployed sensor list. For a full list of supported sensors, check the list here: [List of Supported Sensors](https://github.com/pwnlandia/mhn/wiki/List-of-Supported-Sensors)
 
 ## Integration with Splunk and ArcSight
 
@@ -176,16 +176,16 @@ log should be monitored by the SplunkUniversalForwarder.
 
 This will log the events as CEF to /var/log/mhn-arcsight.log
 
+## Data	
+*NOTICE* **This section is out of date. Community data is not collected by Anomali although MHN still attempts to send this data to Anomali servers.**	
 
-## Data
-
-The MHN server reports anonymized attack data back to Anomali, Inc. (formerly
-known as ThreatStream). If you are interested in viewing this data, get details
-in the
-[wiki](https://github.com/Pwnlandia/mhn/wiki/Getting-Access-to-the-MHN-Community-Data).
-This data reporting can be disabled by running the following command from the
-MHN server after completing the initial installation steps outlined above:
-`/opt/mhn/scripts/disable_collector.sh`
+The MHN server reports anonymized attack data back to Anomali, Inc. (formerly	
+known as ThreatStream). If you are interested in viewing this data, get details	
+in the	
+[wiki](https://github.com/Pwnlandia/mhn/wiki/Getting-Access-to-the-MHN-Community-Data).	
+This data reporting can be disabled by running the following command from the	
+MHN server after completing the initial installation steps outlined above:	
+`/opt/mhn/scripts/disable_collector.sh`	
 
 
 ## Support or Contact

diff --git a/scripts/deploy_conpot.sh b/scripts/deploy_conpot.sh
@@ -23,7 +23,7 @@ cd $CONPOT_HOME
 virtualenv env
 . env/bin/activate
 pip install -U setuptools
-pip install -e git+https://github.com/threatstream/hpfeeds.git#egg=hpfeeds-dev
+pip install -e git+https://github.com/pwnlandia/hpfeeds.git#egg=hpfeeds-dev
 pip install -e git+https://github.com/mushorg/conpot.git@Release_0.5.2#egg=conpot-dev
 pip install -e git+https://github.com/mushorg/modbus-tk.git#egg=modbus-tk
 

diff --git a/scripts/deploy_elastichoney.sh b/scripts/deploy_elastichoney.sh
@@ -17,7 +17,7 @@ apt-get -y install git golang supervisor
 
 # Get the elastichoney source
 cd /opt
-git clone https://github.com/Pwnlandia/elastichoney.git
+git clone https://github.com/pwnlandia/elastichoney.git
 cd elastichoney
 
 export GOPATH=/opt/elastichoney

diff --git a/scripts/deploy_elastichoney_docker.sh b/scripts/deploy_elastichoney_docker.sh
@@ -16,7 +16,7 @@ apt-get -y install docker.io supervisor
 
 
 # Get the elastichoney docker image
-docker pull Pwnlandia/elastichoney
+docker pull pwnlandia/elastichoney
 
 # Register the sensor with the MHN server.
 wget $server_url/static/registration.txt -O registration.sh
@@ -55,7 +55,7 @@ EOF
 # Config for supervisor.
 cat > /etc/supervisor/conf.d/elastichoney.conf <<EOF
 [program:elastichoney]
-command=docker run -p 9200:9200 -p 10000:10000 -v /opt/elastichoney:/etc/elastichoney Pwnlandia/elastichoney:latest
+command=docker run -p 9200:9200 -p 10000:10000 -v /opt/elastichoney:/etc/elastichoney pwnlandia/elastichoney:latest
 directory=/opt/elastichoney
 stdout_logfile=/opt/elastichoney/elastichoney.out
 stderr_logfile=/opt/elastichoney/elastichoney.err

diff --git a/scripts/deploy_glastopf.sh b/scripts/deploy_glastopf.sh
@@ -35,7 +35,7 @@ else
     apt-get install -y apache2 python2.7 python-openssl python-gevent libevent-dev python2.7-dev build-essential make python-chardet python-requests python-sqlalchemy python-lxml python-beautifulsoup mongodb python-pip python-dev python-setuptools g++ git php php-dev liblapack-dev gfortran libmysqlclient-dev libxml2-dev libxslt-dev supervisor
 fi
 
-pip install -e git+https://github.com/threatstream/hpfeeds.git#egg=hpfeeds-dev
+pip install -e git+https://github.com/pwnlandia/hpfeeds.git#egg=hpfeeds-dev
 
 # Install and configure the PHP sandbox
 cd /opt

diff --git a/scripts/deploy_kippo-centos.sh b/scripts/deploy_kippo-centos.sh
@@ -47,7 +47,7 @@ useradd -d /home/kippo -s /bin/bash -m kippo -g users
 
 # Get the Kippo source
 cd /opt
-git clone https://github.com/threatstream/kippo
+git clone https://github.com/pwnlandia/kippo
 cd kippo
 
 

diff --git a/scripts/deploy_kippo.sh b/scripts/deploy_kippo.sh
@@ -31,7 +31,7 @@ useradd -d /home/kippo -s /bin/bash -m kippo -g users
 
 # Get the Kippo source
 cd /opt
-git clone https://github.com/threatstream/kippo
+git clone https://github.com/pwnlandia/kippo
 cd kippo
 
 # Determine if IPTables forwarding is going to work

diff --git a/scripts/deploy_kippo_as_juniper.sh b/scripts/deploy_kippo_as_juniper.sh
@@ -31,7 +31,7 @@ useradd -d /home/kippo -s /bin/bash -m kippo -g users
 
 # Get the Kippo source
 cd /opt
-git clone https://github.com/threatstream/kippo
+git clone https://github.com/pwnlandia/kippo
 cd kippo
 git checkout -b juniper-router origin/juniper-router
 

diff --git a/scripts/deploy_shockpot.sh b/scripts/deploy_shockpot.sh
@@ -17,7 +17,7 @@ pip install virtualenv
 
 # Get the Shockpot source
 cd /opt
-git clone https://github.com/Pwnlandia/shockpot.git
+git clone https://github.com/pwnlandia/shockpot.git
 cd shockpot
 
 virtualenv env

diff --git a/scripts/deploy_shockpot_sinkhole.sh b/scripts/deploy_shockpot_sinkhole.sh
@@ -22,7 +22,7 @@ pip install virtualenv
 
 # Get the Shockpot source
 cd /opt
-git clone https://github.com/threatstream/shockpot.git
+git clone https://github.com/pwnlandia/shockpot.git
 cd shockpot
 
 virtualenv env

diff --git a/scripts/deploy_snort.sh b/scripts/deploy_snort.sh
@@ -43,15 +43,15 @@ pip install virtualenv
 
 cd /tmp
 rm -rf libev*
-wget https://github.com/Pwnlandia/hpfeeds/releases/download/libev-4.15/libev-4.15.tar.gz
+wget https://github.com/pwnlandia/hpfeeds/releases/download/libev-4.15/libev-4.15.tar.gz
 tar zxvf libev-4.15.tar.gz 
 cd libev-4.15
 ./configure && make && make install
 ldconfig
 
 cd /tmp
 rm -rf hpfeeds
-git clone https://github.com/Pwnlandia/hpfeeds.git
+git clone https://github.com/pwnlandia/hpfeeds.git
 cd hpfeeds/appsupport/libhpfeeds
 autoreconf --install
 ./configure && make && make install 

diff --git a/scripts/deploy_suricata.sh b/scripts/deploy_suricata.sh
@@ -42,15 +42,15 @@ pip install pyyaml
 
 cd /tmp
 rm -rf libev*
-wget https://github.com/Pwnlandia/hpfeeds/releases/download/libev-4.15/libev-4.15.tar.gz
+wget https://github.com/pwnlandia/hpfeeds/releases/download/libev-4.15/libev-4.15.tar.gz
 tar zxvf libev-4.15.tar.gz 
 cd libev-4.15
 ./configure && make && make install
 ldconfig
 
 cd /tmp
 rm -rf hpfeeds
-git clone https://github.com/Pwnlandia/hpfeeds.git
+git clone https://github.com/pwnlandia/hpfeeds.git
 cd hpfeeds/appsupport/libhpfeeds
 autoreconf --install
 ./configure && make && make install 

diff --git a/scripts/deploy_wordpot.sh b/scripts/deploy_wordpot.sh
@@ -17,7 +17,7 @@ pip install virtualenv
 
 # Get the Wordpot source
 cd /opt
-git clone https://github.com/threatstream/wordpot.git
+git clone https://github.com/pwnlandia/wordpot.git
 cd wordpot
 
 virtualenv env

diff --git a/scripts/install_honeymap.sh b/scripts/install_honeymap.sh
@@ -57,7 +57,7 @@ SECRET=`python -c 'import uuid;print str(uuid.uuid4()).replace("-","")'`
 /opt/hpfeeds/env/bin/python /opt/hpfeeds/broker/add_user.py honeymap $SECRET "" "geoloc.events"
 
 cd /opt
-git clone https://github.com/threatstream/honeymap.git
+git clone https://github.com/pwnlandia/honeymap.git
 
 cd /opt/honeymap/server
 cat > config.json <<EOF

diff --git a/scripts/install_hpfeeds.sh b/scripts/install_hpfeeds.sh
@@ -48,7 +48,7 @@ bash install_mongo.sh
 $PIP install virtualenv
 
 cd /tmp
-wget https://github.com/Pwnlandia/hpfeeds/releases/download/libev-4.15/libev-4.15.tar.gz
+wget https://github.com/pwnlandia/hpfeeds/releases/download/libev-4.15/libev-4.15.tar.gz
 tar zxvf libev-4.15.tar.gz 
 cd libev-4.15
 ./configure && make && make install
@@ -58,7 +58,7 @@ ldconfig /usr/local/lib/
 mkdir -p /opt
 cd /opt
 rm -rf /opt/hpfeeds
-git clone https://github.com/Pwnlandia/hpfeeds
+git clone https://github.com/pwnlandia/hpfeeds
 chmod 755 -R hpfeeds
 cd hpfeeds
 $VIRTUALENV -p $PYTHON env
@@ -68,7 +68,7 @@ pip install cffi
 pip install pyopenssl==17.3.0
 pip install pymongo
 pip install -e git+https://github.com/couozu/pyev.git#egg=pyev
-pip install -e git+https://github.com/Pwnlandia/evnet.git#egg=evnet-dev
+pip install -e git+https://github.com/pwnlandia/evnet.git#egg=evnet-dev
 pip install .
 deactivate
 

diff --git a/scripts/install_mnemosyne.sh b/scripts/install_mnemosyne.sh
@@ -44,7 +44,7 @@ bash $SCRIPTS/install_mongo.sh
 mkdir -p /opt
 cd /opt/
 rm -rf /opt/mnemosyne
-git clone https://github.com/threatstream/mnemosyne.git
+git clone https://github.com/pwnlandia/mnemosyne.git
 cd mnemosyne
 $VIRTUALENV -p $PYTHON env
 . env/bin/activate

diff --git a/server/mhn/static/js/main.js b/server/mhn/static/js/main.js
@@ -33,6 +33,7 @@ $(document).ready(function() {
                 success: function(resp) {
                     $('#sensor-info').show();
                     $('#sensor-id').html('UUID: ' + resp.uuid);
+                    $('#sensor-secret').html('Secret: ' + resp.secret);
                 },
                 contentType: 'application/json',
                 error: function(resp) {

diff --git a/server/mhn/templates/base.html b/server/mhn/templates/base.html
@@ -84,7 +84,7 @@ <h1><a href="{{ url_for('ui.dashboard') }}">MHN Server</a></h1>
         <div class="row" id="footer">
             <div class="small-7 large-centered columns">
                 <span><small>Modern Honeynet Framework is an open source project by: </small><span>
-                <a href="http://threatstream.com"><img width="158" height="25" src="/static/img/tslogo.png" /></a>
+                <a href="http://github.com/pwnlandia">Pwnlandia</a>
             </div>
         </div>
         {% endblock %}

diff --git a/server/mhn/templates/security/login_user.html b/server/mhn/templates/security/login_user.html
@@ -53,7 +53,7 @@ <h5 style="float:left;">
         <div class="row" id="footer">
             <div class="small-7 large-centered columns">
                 <span><small>Modern Honeynet Framework is an open source project by: </small><span>
-                <a href="http://threatstream.com"><img width="158" height="25" src="/static/img/tslogo.png" /></a>
+                <a href="http://github.com/pwnlandia">Pwnlandia</a>
             </div>
         </div>
       {% endblock %}

diff --git a/server/mhn/templates/ui/add-sensor.html b/server/mhn/templates/ui/add-sensor.html
@@ -45,6 +45,7 @@ <h2>Add a Sensor</h2>
         <div class="row">
             <div class="panel small-8 columns">
                 <h1><small id="sensor-id"></small></h1>
+                <h1><small id="sensor-secret"></small></h1>
             </div>
         </div>
     </div>