Merge pull request #56 from F5-Labs/development

Minor fixed
F5-Labs · Aug 4, 2021 · fe8f8a3 · fe8f8a3
2 parents 03a2bf2 + c32ff4d
commit fe8f8a3
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.7
-LABEL version="1.4.2.2"
+LABEL version="1.4.2.3"
 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.4.2.2"
+__version__ = "1.4.2.3"
diff --git a/cryptonice/__pycache__/__init__.cpython-38.pyc b/cryptonice/__pycache__/__init__.cpython-38.pyc
diff --git a/cryptonice/__pycache__/getdns.cpython-38.pyc b/cryptonice/__pycache__/getdns.cpython-38.pyc
diff --git a/cryptonice/__pycache__/gethttp.cpython-38.pyc b/cryptonice/__pycache__/gethttp.cpython-38.pyc
diff --git a/cryptonice/__pycache__/gettls.cpython-38.pyc b/cryptonice/__pycache__/gettls.cpython-38.pyc
diff --git a/cryptonice/__pycache__/scanner.cpython-38.pyc b/cryptonice/__pycache__/scanner.cpython-38.pyc
diff --git a/cryptonice/getdns.py b/cryptonice/getdns.py
@@ -7,8 +7,7 @@
 def getDNSRecord(hostname, record_type):
     record_list = []
     got_record = False
-    #testdomain = dns.name.from_text(hostname)
-    #print(testdomain.labels)
+    #print('In getdns.py')
 
     try:
         while not got_record:
@@ -21,13 +20,22 @@ def getDNSRecord(hostname, record_type):
             answer = dns.resolver.resolve(hostname, record_type, raise_on_no_answer=False)
 
             if answer.rrset is None:
+                soa = dns.resolver.resolve(hostname, "SOA", raise_on_no_answer=False)
+                soa = soa[0].to_text().split('. ')[0]
+                print('No A record, attempting to find SOA')
+                '''
                 result = answer.response.authority[0].to_text()
+                print('No A record, found ' + str(result))
                 if "SOA" in result:
                     # Check for SOA's pointing to the same hostname and exit loop, if so
                     if result.split('. ')[0] == hostname:
                         got_record = True
+                        print('SOA points to same domain as original hostname')
                     else:
                         hostname = result.split('. ')[0]
+                        print('SOA points to ' + hostname)
+                '''
+                hostname = soa
             else:
                 for ipval in answer:
                     record_list.append(ipval.to_text())

diff --git a/cryptonice/gethttp.py b/cryptonice/gethttp.py
@@ -286,7 +286,7 @@ def get_http(ip_address, hostname, int_port, usetls, http_pages, force_redirect)
 
     # Include page data in output if requested
     if http_pages:
-        connection_data.update({'HTMLbody': pagebody})
+        connection_data.update({'HTMLbody': str(pagebody)})
 
 
     #### Wappalyzer build #####

diff --git a/cryptonice/gettls.py b/cryptonice/gettls.py
@@ -190,7 +190,7 @@ def tls_scan(ip_address, str_host, commands_to_run, port_to_scan):
                 # cycle through all certificates (IP may have more than one)
                 count: int = 0
                 for cert_deployment in certinfo_result.certificate_deployments:
-                    #print(count)
+                    print(count)
                     if count == 0:
                         all_certificates_info.update({'leaf_certificate_has_must_staple_extension':
                                                           cert_deployment.leaf_certificate_has_must_staple_extension})

diff --git a/cryptonice/scanner.py b/cryptonice/scanner.py
@@ -140,7 +140,7 @@ def scanner_driver(input_data):
                     print(f'{hostname} resolves to {ip_address}')
                 except:
                     str_error = "Unable to resolve " + hostname + "(domain does not exist or may not have any A records)"
-                    dns_data = {str_error}
+                    dns_data = ({'Error': str_error})
                     print(str_error)
 
         #########################################################################################################
@@ -194,7 +194,7 @@ def scanner_driver(input_data):
                             print(f'{str_host} resolves to {ip_address}')
                         except:
                             str_error = "Unable to resolve " + str_host + "(domain does not exist or may not have any A records)"
-                            new_dns_data = {str_error}
+                            new_dns_data = ({'Error': str_error})
                             print(str_error)
 
                     # Recheck redirection on hew host

diff --git a/sample_scan.json b/sample_scan.json
@@ -18,5 +18,5 @@
 	"json_path" : "./results/",
 	"recommendations": false,
 	"geolocation": true,
-	"targets": ["hackerone.com"]
+	"targets": ["my-free.website", "www.my-free.website"]
 }