Added ouptut_normal_detail() and output_normal_likely() routines for future file outputs

Author: Michael Skelton

VHostScan.py

@@ -44,17 +44,13 @@ def main():
     if(arguments.ignore_content_length > 0):
         print("[>] Ignoring Content length: %s" % (arguments.ignore_content_length))
 
-    scanner = virtual_host_scanner(arguments.target_hosts, arguments.base_host, arguments.port, arguments.real_port, arguments.ssl, arguments.unique_depth, 
-                                   arguments.ignore_http_codes, arguments.ignore_content_length, arguments.wordlist)
+    scanner = virtual_host_scanner(arguments.target_hosts, arguments.base_host, arguments.port, arguments.real_port, arguments.ssl, arguments.unique_depth, arguments.ignore_http_codes, arguments.ignore_content_length, arguments.wordlist)
 
     scanner.scan()
 
-    print("\n[+] Most likely matches with a unique count of %s or less:" % arguments.unique_depth)
-    for p in scanner.likely_matches(): print("  [>] %s" % p)
-
-    output = output_helper()
-    output.hosts = scanner.hosts
-    output.print_current()
+    output = output_helper(scanner)
+    print(output.output_normal_detail())
+    print(output.output_normal_likely())
 
 if __name__ == "__main__":
     main()

lib/core/virtual_host_scanner.py

@@ -73,7 +73,7 @@ def scan(self):
             # hash the page results to aid in identifing unique content
             page_hash = hashlib.sha256(res.text.encode('utf-8')).hexdigest()
             output = '[#] Found: {} (code: {}, length: {}, hash: {})\n'.format(hostname, res.status_code, 
-                                                                             res.headers.get('content-length'), page_hash)
+                                                                               res.headers.get('content-length'), page_hash)
             # temporary host class code
             host = discovered_host()
             host.hostname = hostname
@@ -82,7 +82,7 @@ def scan(self):
 
             for key, val in res.headers.items():
                 output += '  {}: {}\n'.format(key, val)
-                host.keys.append('  {}: {}\n'.format(key, val))
+                host.keys.append('{}: {}'.format(key, val))
 
             # print current results so feedback remains in "realtime"
             print(output)