File restructure for helpers

Author: Michael Skelton

VHostScan.py

@@ -4,7 +4,8 @@
 import sys
 from argparse import ArgumentParser
 from lib.core.virtual_host_scanner import *
-from lib.outputs.output_normal import *
+from lib.helpers.output_helper import *
+
 
 def print_banner():
     print("+-+-+-+-+-+-+-+-+-+  v. 0.2")
@@ -51,7 +52,7 @@ def main():
     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_normal()
+    output = output_helper()
     output.hosts = scanner.hosts
     output.print_current()
 

lib/core/discovered_host.py

@@ -6,4 +6,5 @@ class discovered_host(object):
     def __init__(self):
         self.hostname = ''
         self.response_code = 0
-        self.hash = ''
+        self.hash = ''
+        self.keys = []

lib/core/virtual_host_scanner.py

@@ -4,6 +4,7 @@
 import pandas as pd
 from lib.core.discovered_host import *
 
+
 class virtual_host_scanner(object):
     """Virtual host scanning class
     
@@ -73,18 +74,19 @@ def scan(self):
             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)
+            # temporary host class code
+            host = discovered_host()
+            host.hostname = hostname
+            host.response_code = res.status_code
+            host.hash = page_hash
 
             for key, val in res.headers.items():
                 output += '  {}: {}\n'.format(key, val)
+                host.keys.append('  {}: {}\n'.format(key, val))
 
             # print current results so feedback remains in "realtime"
             print(output)
 
-            # temporary host class code
-            host = discovered_host()
-            host.hostname = hostname
-            host.response_code = res.status_code
-            host.hash = page_hash
             self.hosts.append(host)
 
             # add url and hash into array for likely matches