Merge pull request #39 from F5-Labs/development

Development
F5-Labs · Jul 5, 2021 · 19544e5 · 19544e5
2 parents 0814577 + 3f127a8
commit 19544e5
Show file tree

Hide file tree

Showing 38 changed files with 20,649 additions and 423 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.7
-LABEL version="1.3.7.1"
+LABEL version="1.3.8"
 LABEL maintainer="f5labs@f5.com"
 RUN pip3 install pycurl
 RUN pip3 install cryptonice

diff --git a/cryptonice/__init__.py b/cryptonice/__init__.py
@@ -2,4 +2,4 @@
 # __init__.py
 
 # Version of cryptonice package
-__version__ = "1.3.7.1"
+__version__ = "1.3.9"
diff --git a/cryptonice/__pycache__/wappalyze.cpython-39.pyc b/cryptonice/__pycache__/wappalyze.cpython-39.pyc
diff --git a/cryptonice/gethttp.py b/cryptonice/gethttp.py
@@ -7,6 +7,7 @@
 # Wappalyzer Requirements
 import json
 import re
+from wappalyze import wappalyze
 # import warnings
 import pkg_resources
 from bs4 import BeautifulSoup
@@ -275,18 +276,30 @@ def get_http(ip_address, hostname, int_port, usetls, http_pages, force_redirect)
     if http_pages:
         connection_data.update({'Page': pagebody})
 
-    conn.close()
 
     #### Wappalyzer build #####
 
     webpage = {}
+
+    '''
     webpage['url'] = str_host + str_path
     webpage['headers'] = res.getheaders()
     webpage['response'] = str(pagebody)
     webpage['html'] = BeautifulSoup(str(pagebody), 'html.parser')
     webpage['scripts'] = [script['src'] for script in webpage['html'].findAll('script', src=True)]
     webpage['metatags'] = {meta['name'].lower(): meta['content']
                            for meta in webpage['html'].findAll('meta', attrs=dict(name=True, content=True))}
+    '''
+
+    webpage['url'] = str_host + str_path
+    webpage['headers'] = res.headers
+    webpage['response'] = str(pagebody)
+    webpage['html'] = BeautifulSoup(str(pagebody), 'html.parser')
+    webpage['scripts'] = [script['src'] for script in webpage['html'].findAll('script', src=True)]
+    webpage['metatags'] = {meta['name'].lower(): meta['content']
+        for meta in webpage['html'].findAll('meta', attrs=dict(name=True, content=True))}
+
+    conn.close()
 
     page = {}
     page['scripts'] = webpage['scripts']
@@ -301,3 +314,8 @@ def get_http(ip_address, hostname, int_port, usetls, http_pages, force_redirect)
     connection_data.update({'Page': page})
 
     return [str_host, str_path, b_httptohttps], connection_data
+
+
+if __name__ == '__main__':
+    analyzed = get_http('93.184.216.34', 'example.com', 443, True, True, True)
+    print (analyzed)