Merge pull request #70 from codingo/codingo-json-output-check

Added feedback for user when -oJ fails to format as JSON

Author: codingo

lib/core/__version__.py

@@ -2,4 +2,4 @@
 # |V|H|o|s|t|S|c|a|n|  Developed by @codingo_ & @__timk
 # +-+-+-+-+-+-+-+-+-+  https://github.com/codingo/VHostScan
 
-__version__ = '1.6.3'
+__version__ = '1.6.4'

lib/helpers/file_helper.py

@@ -16,7 +16,6 @@ def check_directory(self):
             os.mkdir(directory)
             print("[!] %s didn't exist and has been created." % directory)
 
-    # placeholder for error checking on -oJ implementation
     def is_json(json_file):
         try:
             with open(json_file, "r") as f:

lib/helpers/output_helper.py

@@ -15,17 +15,13 @@ def __init__(self, scanner, arguments):
     def write_normal(self, filename):
         file = file_helper(filename)
 
-        # todo: finish check_directory (needs regex to split out filename)
-        # file.check_directory(filename)
-
         output = self.generate_header()
         output += self.output_normal_likely()
 
         if(self.arguments.fuzzy_logic):
             output += self.output_fuzzy()
 
         output += self.output_normal_detail()
-
         file.write_file(output)
 
     def output_normal_likely(self):
@@ -74,6 +70,10 @@ def output_json(self, filename):
             }
 
         output['Result'] = result
+
+        if not file.is_json(output):
+            print("[!] Json format check failed")
+
         file.write_file(json.dumps(output, indent=2))
 
     def output_fuzzy(self):