Merge pull request #320 from guardicore/develop

Version 1.6.3

.gitignore

@@ -82,4 +82,5 @@ MonkeyZoo/*
 !MonkeyZoo/config.tf
 !MonkeyZoo/MonkeyZooDocs.pdf
 
-
+# vim swap files
+*.swp

deployment_scripts/deploy_linux.sh

@@ -89,25 +89,8 @@ kernel=`uname -m`
 linux_dist=`lsb_release -a 2> /dev/null`
 
 # If a user haven't installed mongo manually check if we can install it with our script
-if [[ ! -f "$MONGO_BIN_PATH/mongod" ]] && { [[ ${kernel} != "x86_64" ]] || \
-   { [[ ${linux_dist} != *"Debian"* ]] && [[ ${linux_dist} != *"Ubuntu"* ]]; }; }; then
-    echo "Script does not support your operating system for mongodb installation.
-    Reference monkey island readme and install it manually"
-    exit 1
-fi
-
-# Download mongo
-if [[ ! -f "$MONGO_BIN_PATH/mongod" ]]; then
-    log_message "Downloading mongodb"
-    if [[ ${linux_dist} == *"Debian"* ]]; then
-        wget -c -N -O "/tmp/mongo.tgz" ${MONGO_DEBIAN_URL}
-    elif [[ ${linux_dist} == *"Ubuntu"* ]]; then
-        wget -c -N -O "/tmp/mongo.tgz" ${MONGO_UBUNTU_URL}
-    fi
-    tar --strip 2 --wildcards -C ${MONGO_BIN_PATH} -zxvf /tmp/mongo.tgz mongo*/bin/* || handle_error
-else
-    log_message "Mongo db already installed"
-fi
+log_message "Installing MongoDB"
+${ISLAND_PATH}/linux/install_mongo.sh ${MONGO_BIN_PATH} || handle_error
 
 log_message "Installing openssl"
 sudo apt-get install openssl

monkey/common/cloud/aws_instance.py

@@ -30,14 +30,14 @@ class AwsInstance(object):
             self.region = self._parse_region(
                 urllib2.urlopen(AWS_LATEST_METADATA_URI_PREFIX + 'meta-data/placement/availability-zone').read())
         except urllib2.URLError as e:
-            logger.error("Failed init of AwsInstance while getting metadata: {}".format(e.message))
+            logger.warning("Failed init of AwsInstance while getting metadata: {}".format(e.message))
 
         try:
             self.account_id = self._extract_account_id(
                 urllib2.urlopen(
                     AWS_LATEST_METADATA_URI_PREFIX + 'dynamic/instance-identity/document', timeout=2).read())
         except urllib2.URLError as e:
-            logger.error("Failed init of AwsInstance while getting dynamic instance data: {}".format(e.message))
+            logger.warning("Failed init of AwsInstance while getting dynamic instance data: {}".format(e.message))
 
     @staticmethod
     def _parse_region(region_url_response):

monkey/infection_monkey/control.py

@@ -9,7 +9,7 @@ from requests.exceptions import ConnectionError
 import infection_monkey.monkeyfs as monkeyfs
 import infection_monkey.tunnel as tunnel
 from infection_monkey.config import WormConfiguration, GUID
-from infection_monkey.network.info import local_ips, check_internet_access
+from infection_monkey.network.info import local_ips, check_internet_access, TIMEOUT
 from infection_monkey.transport.http import HTTPConnectProxy
 from infection_monkey.transport.tcp import TcpProxy
 
@@ -19,9 +19,6 @@ requests.packages.urllib3.disable_warnings()
 
 LOG = logging.getLogger(__name__)
 DOWNLOAD_CHUNK = 1024
-# random number greater than 5,
-# to prevent the monkey from just waiting forever to try and connect to an island before going elsewhere.
-TIMEOUT = 15
 
 
 class ControlClient(object):

monkey/infection_monkey/exploit/struts2.py

@@ -7,6 +7,7 @@ import urllib2
 import httplib
 import unicodedata
 import re
+import ssl
 
 import logging
 from infection_monkey.exploit.web_rce import WebRCE
@@ -47,7 +48,7 @@ class Struts2Exploiter(WebRCE):
         headers = {'User-Agent': 'Mozilla/5.0'}
         request = urllib2.Request(url, headers=headers)
         try:
-            return urllib2.urlopen(request).geturl()
+            return urllib2.urlopen(request, context=ssl._create_unverified_context()).geturl()
         except urllib2.URLError:
             LOG.error("Can't reach struts2 server")
             return False

monkey/infection_monkey/exploit/web_rce.py

@@ -13,7 +13,7 @@ __author__ = 'VakarisZ'
 LOG = logging.getLogger(__name__)
 # Command used to check if monkeys already exists
 LOOK_FOR_FILE = "ls %s"
-POWERSHELL_NOT_FOUND = "owershell is not recognized"
+POWERSHELL_NOT_FOUND = "powershell is not recognized"
 # Constants used to refer to windows architectures( used in host.os['machine'])
 WIN_ARCH_32 = "32"
 WIN_ARCH_64 = "64"
@@ -253,7 +253,7 @@ class WebRCE(HostExploiter):
         if 'No such file' in resp:
             return False
         else:
-            LOG.info("Host %s was already infected under the current configuration, done" % host)
+            LOG.info("Host %s was already infected under the current configuration, done" % str(host))
             return True
 
     def check_remote_files(self, url):
@@ -281,7 +281,7 @@ class WebRCE(HostExploiter):
         """
         ports = self.get_open_service_ports(ports, names)
         if not ports:
-            LOG.info("All default web ports are closed on %r, skipping", host)
+            LOG.info("All default web ports are closed on %r, skipping", str(host))
             return False
         else:
             return ports

monkey/infection_monkey/main.py

@@ -13,7 +13,8 @@ from infection_monkey.config import WormConfiguration, EXTERNAL_CONFIG_FILE
 from infection_monkey.dropper import MonkeyDrops
 from infection_monkey.model import MONKEY_ARG, DROPPER_ARG
 from infection_monkey.monkey import InfectionMonkey
-import infection_monkey.post_breach # dummy import for pyinstaller
+# noinspection PyUnresolvedReferences
+import infection_monkey.post_breach  # dummy import for pyinstaller
 
 __author__ = 'itamar'
 
@@ -23,7 +24,7 @@ LOG_CONFIG = {'version': 1,
               'disable_existing_loggers': False,
               'formatters': {'standard': {
                   'format': '%(asctime)s [%(process)d:%(thread)d:%(levelname)s] %(module)s.%(funcName)s.%(lineno)d: %(message)s'},
-                             },
+              },
               'handlers': {'console': {'class': 'logging.StreamHandler',
                                        'level': 'DEBUG',
                                        'formatter': 'standard'},
@@ -70,7 +71,8 @@ def main():
     print("Loaded Configuration: %r" % WormConfiguration.as_dict())
 
     # Make sure we're not in a machine that has the kill file
-    kill_path = os.path.expandvars(WormConfiguration.kill_file_path_windows) if sys.platform == "win32" else WormConfiguration.kill_file_path_linux
+    kill_path = os.path.expandvars(
+        WormConfiguration.kill_file_path_windows) if sys.platform == "win32" else WormConfiguration.kill_file_path_linux
     if os.path.exists(kill_path):
         print("Kill path found, finished run")
         return True

monkey/infection_monkey/network/info.py

@@ -8,6 +8,10 @@ import itertools
 import netifaces
 from subprocess import check_output
 from random import randint
+
+import requests
+from requests import ConnectionError
+
 from common.network.network_range import CidrRange
 
 try:
@@ -16,6 +20,10 @@ except NameError:
     long = int  # Python 3
 
 
+# Timeout for monkey connections
+TIMEOUT = 15
+
+
 def get_host_subnets():
     """
     Returns a list of subnets visible to host (omitting loopback and auto conf networks)
@@ -124,14 +132,18 @@ def get_free_tcp_port(min_range=1000, max_range=65535):
 
 def check_internet_access(services):
     """
-    Checks if any of the services are accessible, over ICMP
+    Checks if any of the services are accessible, over HTTPS
     :param services: List of IPs/hostnames
     :return: boolean depending on internet access
     """
-    ping_str = "-n 1" if sys.platform.startswith("win") else "-c 1"
     for host in services:
-        if os.system("ping " + ping_str + " " + host) == 0:
+        try:
+            requests.get("https://%s" % (host,), timeout=TIMEOUT, verify=False)
             return True
+        except ConnectionError:
+            # Failed connecting
+            pass
+
     return False
 
 

monkey/monkey_island/cc/app.py

@@ -28,6 +28,7 @@ from monkey_island.cc.resources.root import Root
 from monkey_island.cc.resources.telemetry import Telemetry
 from monkey_island.cc.resources.telemetry_feed import TelemetryFeed
 from monkey_island.cc.resources.pba_file_download import PBAFileDownload
+from monkey_island.cc.resources.version_update import VersionUpdate
 from monkey_island.cc.services.config import ConfigService
 from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
 from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService
@@ -83,18 +84,14 @@ def output_json(obj, code, headers=None):
     return resp
 
 
-def init_app(mongo_url):
-    app = Flask(__name__)
-
-    api = flask_restful.Api(app)
-    api.representations = {'application/json': output_json}
-
+def init_app_config(app, mongo_url):
     app.config['MONGO_URI'] = mongo_url
-
     app.config['SECRET_KEY'] = str(uuid.getnode())
     app.config['JWT_AUTH_URL_RULE'] = '/api/auth'
     app.config['JWT_EXPIRATION_DELTA'] = env.get_auth_expiration_time()
 
+
+def init_app_services(app):
     init_jwt(app)
     mongo.init_app(app)
 
@@ -105,9 +102,13 @@ def init_app(mongo_url):
     # If running on AWS, this will initialize the instance data, which is used "later" in the execution of the island.
     RemoteRunAwsService.init()
 
+
+def init_app_url_rules(app):
     app.add_url_rule('/', 'serve_home', serve_home)
     app.add_url_rule('/<path:static_path>', 'serve_static_file', serve_static_file)
 
+
+def init_api_resources(api):
     api.add_resource(Root, '/api')
     api.add_resource(Monkey, '/api/monkey', '/api/monkey/', '/api/monkey/<string:guid>')
     api.add_resource(LocalRun, '/api/local-monkey', '/api/local-monkey/')
@@ -130,5 +131,18 @@ def init_app(mongo_url):
                      '/api/fileUpload/<string:file_type>?restore=<string:filename>')
     api.add_resource(RemoteRun, '/api/remote-monkey', '/api/remote-monkey/')
     api.add_resource(AttackTelem, '/api/attack/<string:technique>')
+    api.add_resource(VersionUpdate, '/api/version-update', '/api/version-update/')
+
+
+def init_app(mongo_url):
+    app = Flask(__name__)
+
+    api = flask_restful.Api(app)
+    api.representations = {'application/json': output_json}
+
+    init_app_config(app, mongo_url)
+    init_app_services(app)
+    init_app_url_rules(app)
+    init_api_resources(api)
 
     return app

monkey/monkey_island/cc/environment/__init__.py

@@ -13,6 +13,7 @@ class Environment(object):
     _MONGO_URL = os.environ.get("MONKEY_MONGO_URL", "mongodb://localhost:27017/monkeyisland")
     _DEBUG_SERVER = False
     _AUTH_EXPIRATION_TIME = timedelta(hours=1)
+    _MONKEY_VERSION = "1.6.3"
 
     def __init__(self):
         self.config = None
@@ -37,6 +38,21 @@ class Environment(object):
         h.update(secret)
         return h.hexdigest()
 
+    def get_deployment(self):
+        return self._get_from_config('deployment', 'unknown')
+
+    def is_develop(self):
+        return self.get_deployment() == 'develop'
+
+    def get_version(self):
+        return self._MONKEY_VERSION + ('-dev' if self.is_develop() else '')
+
+    def _get_from_config(self, key, default_value=None):
+        val = default_value
+        if self.config is not None:
+            val = self.config.get(key, val)
+        return val
+
     @abc.abstractmethod
     def get_auth_users(self):
         return

monkey/monkey_island/cc/environment/environment.py

@@ -32,6 +32,7 @@ def load_env_from_file():
     config_json = load_server_configuration_from_file()
     return config_json['server_config']
 
+
 try:
     config_json = load_server_configuration_from_file()
     __env_type = config_json['server_config']

monkey/monkey_island/cc/resources/version_update.py

@@ -0,0 +1,24 @@
+import flask_restful
+import logging
+
+from monkey_island.cc.environment.environment import env
+from monkey_island.cc.auth import jwt_required
+from monkey_island.cc.services.version_update import VersionUpdateService
+
+__author__ = 'itay.mizeretz'
+
+logger = logging.getLogger(__name__)
+
+
+class VersionUpdate(flask_restful.Resource):
+    def __init__(self):
+        super(VersionUpdate, self).__init__()
+
+    # We don't secure this since it doesn't give out any private info and we want UI to know version
+    # even when not authenticated
+    def get(self):
+        return {
+            'current_version': env.get_version(),
+            'newer_version': VersionUpdateService.get_newer_version(),
+            'download_link': VersionUpdateService.get_download_link()
+        }

monkey/monkey_island/cc/server_config.json

@@ -1,3 +1,4 @@
 {
-  "server_config": "standard"
-}
+  "server_config": "standard",
+  "deployment": "develop"
+}

monkey/monkey_island/cc/services/config_schema.py

@@ -250,8 +250,9 @@ SCHEMA = {
                             "default": [
                             ],
                             "description":
-                                "List of IPs/subnets the monkey should scan."
-                                " Examples: \"192.168.0.1\", \"192.168.0.5-192.168.0.20\", \"192.168.0.5/24\""
+                                "List of IPs/subnets/hosts the monkey should scan."
+                                " Examples: \"192.168.0.1\", \"192.168.0.5-192.168.0.20\", \"192.168.0.5/24\","
+                                " \"printer.example\""
                         }
                     }
                 },

monkey/monkey_island/cc/services/version_update.py

@@ -0,0 +1,57 @@
+import logging
+
+import requests
+
+from monkey_island.cc.environment.environment import env
+
+__author__ = "itay.mizeretz"
+
+logger = logging.getLogger(__name__)
+
+
+class VersionUpdateService:
+    VERSION_SERVER_URL_PREF = 'https://monkey.guardicore.com'
+    VERSION_SERVER_CHECK_NEW_URL = VERSION_SERVER_URL_PREF + '?deployment=%s&monkey_version=%s'
+    VERSION_SERVER_DOWNLOAD_URL = VERSION_SERVER_CHECK_NEW_URL + '&is_download=true'
+
+    newer_version = None
+
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def get_newer_version():
+        """
+        Checks for newer version if never checked before.
+        :return: None if failed checking for newer version, result of '_check_new_version' otherwise
+        """
+        if VersionUpdateService.newer_version is None:
+            try:
+                VersionUpdateService.newer_version = VersionUpdateService._check_new_version()
+            except Exception:
+                logger.exception('Failed updating version number')
+
+        return VersionUpdateService.newer_version
+
+    @staticmethod
+    def _check_new_version():
+        """
+        Checks if newer monkey version is available
+        :return: False if not, version in string format ('1.6.2') otherwise
+        """
+        url = VersionUpdateService.VERSION_SERVER_CHECK_NEW_URL % (env.get_deployment(), env.get_version())
+
+        reply = requests.get(url, timeout=15)
+
+        res = reply.json().get('newer_version', None)
+
+        if res is False:
+            return res
+
+        [int(x) for x in res.split('.')]  # raises value error if version is invalid format
+        return res
+
+    @staticmethod
+    def get_download_link():
+        return VersionUpdateService.VERSION_SERVER_DOWNLOAD_URL % (env.get_deployment(), env.get_version())
+

monkey/monkey_island/cc/ui/src/components/Main.js

@@ -20,6 +20,7 @@ import 'react-data-components/css/table-twbs.css';
 import 'styles/App.css';
 import 'react-toggle/style.css';
 import 'react-table/react-table.css';
+import VersionComponent from "./side-menu/VersionComponent";
 
 let logoImage = require('../images/monkey-icon.svg');
 let infectionMonkeyImage = require('../images/infection-monkey.svg');
@@ -85,7 +86,7 @@ class AppComponent extends AuthComponent {
         infection_done: false,
         report_done: false,
         isLoggedIn: undefined
-      }
+      },
     };
   }
 
@@ -175,6 +176,7 @@ class AppComponent extends AuthComponent {
               <div className="license-link text-center">
                 <NavLink to="/license">License</NavLink>
               </div>
+              <VersionComponent/>
             </Col>
             <Col sm={9} md={10} smOffset={3} mdOffset={2} className="main">
               <Route path='/login' render={(props) => (<LoginPageComponent onStatusChange={this.updateStatus}/>)}/>

monkey/monkey_island/cc/ui/src/components/side-menu/VersionComponent.js

@@ -0,0 +1,46 @@
+import React from 'react';
+import {Icon} from 'react-fa';
+
+class VersionComponent extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      currentVersion: undefined,
+      newerVersion: undefined,
+      downloadLink: undefined
+    }
+  }
+
+  componentDidMount() {
+    fetch('/api/version-update') // This is not authenticated on purpose
+      .then(res => res.json())
+      .then(res => {
+        this.setState({
+          currentVersion: res['current_version'],
+          newerVersion: res['newer_version'],
+          downloadLink: res['download_link'],
+        });
+      });
+  }
+
+  render() {
+    return (
+      <div className="version-text text-center">
+        Infection Monkey Version: {this.state.currentVersion}
+        {
+          this.state.newerVersion ?
+            <div>
+              <b>Newer version available!</b>
+              <br/>
+              <b><a target="_blank" href={this.state.downloadLink}>Download here <Icon name="download"/></a></b>
+            </div>
+            :
+            undefined
+        }
+      </div>
+    );
+  }
+}
+
+
+export default VersionComponent;

monkey/monkey_island/cc/ui/src/styles/App.css

@@ -515,3 +515,13 @@ body {
   }
 
 }
+
+.version-text {
+  font-size: 0.9em;
+  position: absolute;
+  bottom: 5px;
+  left: 0;
+  right: 0;
+  margin-left: auto;
+  margin-right: auto;
+}

monkey/monkey_island/linux/install_mongo.sh

@@ -3,19 +3,19 @@
 export os_version_monkey=$(cat /etc/issue)
 MONGODB_DIR=$1 # If using deb, this should be: /var/monkey/monkey_island/bin/mongodb
 
-if [[ $os_version_monkey == "Ubuntu 16.04"* ]] ;
+if [[ ${os_version_monkey} == "Ubuntu 16.04"* ]] ;
 then
 	echo Detected Ubuntu 16.04
 	export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.12.tgz"
-elif [[ $os_version_monkey == "Ubuntu 18.04"* ]] ;
+elif [[ ${os_version_monkey} == "Ubuntu 18.04"* ]] ;
 then
 	echo Detected Ubuntu 18.04
 	export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.0.8.tgz"
-elif [[ $os_version_monkey == "Debian GNU/Linux 8"* ]] ;
+elif [[ ${os_version_monkey} == "Debian GNU/Linux 8"* ]] ;
 then
 	echo Detected Debian 8
 	export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-debian81-3.6.12.tgz"
-elif [[ $os_version_monkey == "Debian GNU/Linux 9"* ]] ;
+elif [[ ${os_version_monkey} == "Debian GNU/Linux 9"* ]] ;
 then
 	echo Detected Debian 9
 	export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-debian92-3.6.12.tgz"
@@ -25,15 +25,15 @@ else
 fi
 
 TEMP_MONGO=$(mktemp -d)
-pushd $TEMP_MONGO
-wget $tgz_url -O mongodb.tgz
+pushd ${TEMP_MONGO}
+wget ${tgz_url} -O mongodb.tgz
 tar -xf mongodb.tgz
 popd
 
-mkdir -p $MONGODB_DIR/bin
-cp $TEMP_MONGO/mongodb-*/bin/mongod $MONGODB_DIR/bin/mongod
-cp $TEMP_MONGO/mongodb-*/LICENSE-Community.txt $MONGODB_DIR/
-chmod a+x $MONGODB_DIR/bin/mongod
-rm -r $TEMP_MONGO
+mkdir -p ${MONGODB_DIR}/bin
+cp ${TEMP_MONGO}/mongodb-*/bin/mongod ${MONGODB_DIR}/bin/mongod
+cp ${TEMP_MONGO}/mongodb-*/LICENSE-Community.txt ${MONGODB_DIR}/
+chmod a+x ${MONGODB_DIR}/bin/mongod
+rm -r ${TEMP_MONGO}
 
 exit 0

monkey/monkey_island/readme.txt

@@ -65,12 +65,8 @@ How to run:
 
 4. Setup MongoDB (Use one of the two following options):
         4.a. Download MongoDB and extract it to /var/monkey_island/bin/mongodb
-                for debian64 - https://downloads.mongodb.org/linux/mongodb-linux-x86_64-debian81-latest.tgz
-                for ubuntu64 16.10 - https://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-latest.tgz
-                find more at - https://www.mongodb.org/downloads#production
-                untar.gz with: tar -zxvf filename.tar.gz -C /var/monkey_island/bin/mongodb
-                (make sure the content of the mongo folder is in this directory, meaning this path exists:
-                        /var/monkey_island/bin/mongodb/bin)        
+			4.a.1. Run '/var/monkey_island/linux/install_mongo.sh /var/monkey_island/bin/mongodb'
+				   This will download and extract the relevant mongoDB for your OS.
         OR
         4.b. Use already running instance of mongodb
 			4.b.1. Run 'set MONKEY_MONGO_URL="mongodb://<SERVER ADDR>:27017/monkeyisland"'. Replace '<SERVER ADDR>' with address of mongo server

monkey/monkey_island/requirements.txt

@@ -1,3 +1,4 @@
+bson
 python-dateutil
 tornado==5.1.1
 werkzeug
@@ -18,7 +19,7 @@ boto3
 botocore
 PyInstaller
 awscli
-bson
 cffi
 virtualenv
 wheel
+requests

monkey/monkey_island/windows/run_mongodb.bat

@@ -1,3 +1,3 @@
 REM - Runs MongoDB Server -
 @title MongoDB
-@bin\mongodb\mongod.exe --dbpath db
+@bin\mongodb\mongod.exe --dbpath db --bind_ip 127.0.0.1