Merge pull request #43 from ztgrace/development

Merging 1.0.2

Author: ztgrace

.travis.yml

@@ -14,6 +14,7 @@ addons:
     - unixodbc-dev
 install: 
   - pip install -r requirements.txt
+  - pip install -r dev-requirements.txt
   - pip install coverage
 services:
   - redis-server

changeme/core.py

@@ -393,7 +393,7 @@ def check_for_interrupted_scan(config):
     scanners = RedisQueue('scanners')
     fp_qsize = 0
     scanners_qsize = 0
-    logger.warning('scanners: %s, fp: %s' % (scanners_qsize, fp_qsize))
+    logger.debug('scanners: %s, fp: %s' % (scanners_qsize, fp_qsize))
     try:
         fp_qsize = fp.qsize()
     except redis.exceptions.ConnectionError:
@@ -471,7 +471,7 @@ def check_version():
         logger.debug("Unable to retrieve latest changeme version.")
         return
 
-    latest = res.text.split(' = ')[1].replace("'", '')
+    latest = res.text.split('\n')[0].split(' = ')[1].replace("'", '')
     if not version.__version__ == latest:
         logger.warning('Your version of changeme is out of date. Local version: %s, Latest: %s' % (str(version.__version__), latest))
 

changeme/scan_engine.py

@@ -150,9 +150,6 @@ def _build_targets(self):
 
         fingerprints = list(set(fingerprints))  # unique the HTTP fingerprints
 
-        for f in fingerprints:
-            self.logger.debug("fingerprints: %s" % f.target)
-
         # Add any protocols if they were included in the targets
         for t in self.targets:
             if t.protocol and t.protocol not in self.config.protocols:

changeme/scanners/ftp.py

@@ -8,7 +8,7 @@ def __init__(self, cred, target, username, password, config):
 
     def _check(self):
         ftp = ftplib.FTP()
-        ftp.connect(str(self.target.host), self.target.port)
+        ftp.connect(self.target.host, self.target.port)
 
         ftp.login(self.username, self.password)
         evidence = ftp.retrlines('LIST')

changeme/scanners/http_fingerprint.py

@@ -32,7 +32,6 @@ def __hash__(self):
         return hash(str(self.target) + str(self.headers) + str(self.cookies))
 
     def __eq__(self, other):
-        #if self.target == other.target and self.url == other.url and self.port == other.port and self.ssl == other.ssl and self.headers == other.headers and self.cookies == other.cookies:
         return self.__dict__ == other.__dict__
 
     def fingerprint(self):
@@ -163,7 +162,6 @@ def build_fingerprints(targets, creds, config):
                     if not t.port:
                         t.port = c['default_port']
                     t.url = url
-                    logger.debug(url)
 
                     hfp = HttpFingerprint(
                         t,

changeme/scanners/scanner.py

@@ -5,16 +5,14 @@
 
 class Scanner(object):
     def __init__(self, cred, target, config, username, password):
+        self.logger = logging.getLogger('changeme')
         self.cred = cred
         self.target = target
-        if not self.target.port:
-            self.port = self.target.port
-        else:
-            self.port = self.cred['default_port']
+        if self.target.port is None:
+            self.target.port = self.cred['default_port']
         self.config = config
         self.username = username
         self.password = password
-        self.logger = logging.getLogger('changeme')
 
     def __hash__(self):
         return id(self)
@@ -54,7 +52,7 @@ def check_success(self):
                     'evidence': evidence}
 
         except Exception as e:
-            self.logger.info('Invalid %s default cred %s:%s at %s' % (self.cred['name'], self.username, self.password, '%s:%s' % (self.target, str(self.port))))
+            self.logger.info('Invalid %s default cred %s:%s at %s' % (self.cred['name'], self.username, self.password, str(self.target)))
             self.logger.debug('%s Exception: %s' % (type(e).__name__, str(e)))
             return False
 

changeme/scanners/ssh.py

@@ -11,7 +11,7 @@ def __init__(self, cred, target, username, password, config):
     def _check(self):
         c = paramiko.SSHClient()
         c.set_missing_host_key_policy(paramiko.MissingHostKeyPolicy())  # ignore unknown hosts
-        c.connect(hostname=str(self.target), username=self.username, password=self.password)
+        c.connect(hostname=self.target.host, port=self.target.port, username=self.username, password=self.password)
         stdin, stdout, stderr = c.exec_command('uname -a')
         evidence = stdout.readlines()[0]
         c.close()

changeme/scanners/ssh_key.py

@@ -19,7 +19,7 @@ def _check(self):
 
         c = paramiko.SSHClient()
         c.set_missing_host_key_policy(paramiko.MissingHostKeyPolicy())  # ignore unknown hosts
-        c.connect(hostname=str(self.target), username=self.username, pkey=key)
+        c.connect(hostname=self.target.host, port=self.target.port, username=self.username, pkey=key)
         stdin, stdout, stderr = c.exec_command('uname -a')
         evidence = stdout.readlines()[0]
         c.close()

changeme/target.py

@@ -2,9 +2,10 @@
 import logging
 from netaddr import IPNetwork
 from netaddr.core import AddrFormatError
+import re
 from os.path import isfile
 import shodan
-import re
+import socket
 
 class Target(object):
     def __init__(self, host=None, port=None, protocol=None, url=None):
@@ -20,6 +21,7 @@ def __init__(self, host=None, port=None, protocol=None, url=None):
             self.port = None
         self.protocol = protocol
         self.url = url
+        self.ip = None
 
     def __eq__(self, other):
         return self.__dict__ == other.__dict__
@@ -47,6 +49,17 @@ def __str__(self):
 
         return str(target)
 
+    def get_ip(self):
+        if self.ip is None:
+            regex = re.compile(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$')
+            result = regex.match(self.host)
+            if not result:
+                self.ip = socket.gethostbyname(self.host)
+            else:
+                self.ip = self.host
+
+        return self.ip
+
     @staticmethod
     def parse_target(target):
         logger = logging.getLogger('changeme')

changeme/version.py

@@ -1,4 +1,4 @@
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 contributors = [
     "ztgrace",
     "the-c0d3r",

creds/snmp/common.yml

@@ -30,8 +30,6 @@ auth:
     password: private
   - username:
     password: all
-  - username:
-    password: public
   - username:
     password: ANYCOM
   - username:
@@ -124,8 +122,6 @@ auth:
     password: password
   - username:
     password: pr1v4t3
-  - username:
-    password: private
   - username:
     password: Private
   - username:

creds/snmp/public_private.yml

@@ -0,0 +1,10 @@
+auth:
+  credentials:
+  - username:
+    password: public
+  - username:
+    password: private
+category: snmp
+default_port: 161
+name: publicprivate
+contributor: ztgrace

dev-requirements.txt

@@ -0,0 +1,3 @@
+mock
+mock-ssh-server
+responses==0.7.0

requirements.txt

@@ -14,7 +14,6 @@ python-libnmap
 pyyaml
 redis
 requests
-responses
 selenium
 shodan
 sqlalchemy

tests/snmp.py

@@ -14,21 +14,21 @@ def reset_handlers():
 
 snmp_args = deepcopy(cli_args)
 snmp_args['protocols'] = 'snmp'
-snmp_args['name'] = 'apc'
+snmp_args['name'] = 'publicprivate'
 snmp_args['target'] = 'demo.snmplabs.com'
 @mock.patch('argparse.ArgumentParser.parse_args', return_value=argparse.Namespace(**snmp_args))
 def test_snmp(mock_args):
-    try:
-        reset_handlers()
-        core.main()
-    except:
-        pass
+    reset_handlers()
+    se = core.main()
+    assert se.found_q.qsize() == 2
 
 
 snmp_args = deepcopy(cli_args)
-snmp_args['name'] = 'apc'
+snmp_args['name'] = 'publicprivate'
 snmp_args['target'] = 'snmp://demo.snmplabs.com'
 @mock.patch('argparse.ArgumentParser.parse_args', return_value=argparse.Namespace(**snmp_args))
 def test_snmp_proto(mock_args):
     reset_handlers()
-    core.main()
+    se = core.main()
+    assert se.found_q.qsize() == 2
+