diff --git a/anubis/__init__.py b/anubis/__init__.py index 21320a8..e46aee1 100644 --- a/anubis/__init__.py +++ b/anubis/__init__.py @@ -1 +1 @@ -__version__ = '0.8.4' +__version__ = '0.9' diff --git a/anubis/commands/target.py b/anubis/commands/target.py index a01f833..2a003c8 100644 --- a/anubis/commands/target.py +++ b/anubis/commands/target.py @@ -12,7 +12,6 @@ from anubis.scanners.hackertarget import subdomain_hackertarget from anubis.scanners.netcraft import search_netcraft from anubis.scanners.nmap import scan_host -from anubis.scanners.pkey import search_pkey from anubis.scanners.recursive import recursive_search from anubis.scanners.shodan import search_shodan from anubis.scanners.ssl import search_subject_alt_name, ssl_scan @@ -76,7 +75,8 @@ def run(self): args=(self, target)), threading.Thread(target=search_virustotal, args=(self, target)), - threading.Thread(target=search_pkey, args=(self, target)), + # threading.Thread(target=search_pkey, args=(self, target)), + # Removed pkey as of June 18 2018 due to issues on their end (not connecting) threading.Thread(target=search_netcraft, args=(self, target)), threading.Thread(target=search_crtsh, args=(self, target)), threading.Thread(target=search_dnsdumpster, diff --git a/anubis/scanners/ssl.py b/anubis/scanners/ssl.py index 177d01f..a6b7468 100644 --- a/anubis/scanners/ssl.py +++ b/anubis/scanners/ssl.py @@ -2,15 +2,15 @@ from sslyze.plugins.heartbleed_plugin import HeartbleedScanCommand from sslyze.plugins.http_headers_plugin import HttpHeadersScanCommand from sslyze.plugins.openssl_cipher_suites_plugin import Tlsv10ScanCommand, Tlsv12ScanCommand -from sslyze.server_connectivity import ServerConnectivityInfo +from sslyze.server_connectivity_tester import ServerConnectivityTester from sslyze.synchronous_scanner import SynchronousScanner def search_subject_alt_name(self, target): print("Searching for Subject Alt Names") try: - server_info = ServerConnectivityInfo(hostname=target) - server_info.test_connectivity_to_server() + server_tester = ServerConnectivityTester(hostname=target) + server_info = server_tester.perform() synchronous_scanner = SynchronousScanner() # Certificate information @@ -29,8 +29,8 @@ def search_subject_alt_name(self, target): def ssl_scan(self, target): print("Running SSL Scan") try: - server_info = ServerConnectivityInfo(hostname=target) - server_info.test_connectivity_to_server() + server_tester = ServerConnectivityTester(hostname=target) + server_info = server_tester.perform() synchronous_scanner = SynchronousScanner() # TLS 1.0 diff --git a/requirements.txt b/requirements.txt index 0040d46..5656849 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -setuptools==38.5.2 -SSLyze==1.2.0 +setuptools +SSLyze==1.4.2 python_nmap==0.6.1 shodan==1.7.7 docopt==0.6.2 diff --git a/setup.py b/setup.py index 049536e..40cb1b4 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def run(self): 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', ], keywords='cli', packages=find_packages(exclude=['docs', 'tests*']), python_requires='>=3', - install_requires=['docopt', 'setuptools', 'SSLyze==1.2.0', + install_requires=['docopt', 'setuptools', 'SSLyze==1.4.2', 'python_nmap==0.6.1', 'shodan', 'requests', 'censys', 'dnspython==1.15.0'], extras_require={'test': ['coverage', 'pytest', 'pytest-cov'], },