-c option for conditionally included comments

Author: bl4de

htmlanalyzer/htmlanalyzer.py

@@ -14,21 +14,26 @@
 # @TODO: args parser for: -c (comments) -s (links/src), -j (JavaScript)
 
 # find interesting string(s)
-def analyze_line(_line, i):
+def analyze_line(_line, i, include_comments):
     """single HTML source line - code analyze"""
-    modules.detection_engine.detect_comments(_line, i)
+    if include_comments == True:
+        modules.detection_engine.detect_comments(_line, i)
+
     modules.detection_engine.detect_admin_stuff(_line, i)
     modules.detection_engine.detect_debug(_line, i)
     modules.detection_engine.detect_external_resources(_line, i)
     modules.detection_engine.detect_javascript(_line, i)
     modules.detection_engine.detect_dombased_xss(_line, i)
 
 
-def main(_filename):
+def main(_filename, args):
     """main program loop"""
     _ident = ""
     _fw = ""
 
+    # include comments?
+    include_comments = True if args.c else False
+
     try:
         _file = open(_filename, "r")
         print "[+] {} opened, starting analysis...\n\n".format(_filename)
@@ -42,7 +47,7 @@ def main(_filename):
 
     for _line in _file:
         i += 1
-        analyze_line(_line, i)
+        analyze_line(_line, i, include_comments)
         if _ident == "":
             _ident = modules.detection_engine.identify(_line)
         if _fw == "":
@@ -58,6 +63,9 @@ def main(_filename):
     parser.add_argument(
         '-u', help='Target url - index.html will be downloaded')
     parser.add_argument('-f', help='HTML file name to analyze')
+    parser.add_argument(
+        '-c', help='include comments in summary (excluded by default)')
+
     _filename = "index.html"
     args = parser.parse_args()
 
@@ -68,4 +76,4 @@ def main(_filename):
     if args.f and not args.u:
         _filename = args.f
 
-    main(_filename)
+    main(_filename, args)

htmlanalyzer/modules/detection_engine.py

@@ -37,14 +37,21 @@ def detect_dombased_xss(_line, i):
         'document.url',
         'document.urlencoded',
         'document.referrer',
-        'window.location'
+        'window.location',
+        'document.write(',
+        'document.writeln('
+        '.innerHTML',
+        'eval(',
+        'setInterval(',
+        'setTimeout(',
+        'Function('
     ]
 
     for dombased_call in dombased_calls:
         if dombased_call in _line.lower():
             print_output_line(i, ConsoleOutputBeautifier.getColor("red"),
                               "POSSIBLE DOM BASED INJECTION POINT found at line %d:   %s",
-                              (i, _line.lstrip().rstrip()), "DOM BASED XSS")
+                              (i, _line.lstrip().rstrip()[0:120] + '...'), "DOM BASED XSS")
 
 
 def detect_comments(_line, i):
@@ -53,11 +60,11 @@ def detect_comments(_line, i):
         if "\"/" in _line:
             print_output_line(i, ConsoleOutputBeautifier.getColor("red"),
                               "COMMENTED PATH found at line %d:   %s",
-                              (i, _line.lstrip().rstrip()), "COMMENT")
+                              (i, _line.lstrip().rstrip()[0:120] + '...'), "COMMENT")
         else:
             print_output_line(i, ConsoleOutputBeautifier.getColor("yellow"),
                               "COMMENT found at line %d:   %s",
-                              (i, _line.lstrip().rstrip()), "COMMENT")
+                              (i, _line.lstrip().rstrip()[0:120] + '...'), "COMMENT")
 
 
 def detect_admin_stuff(_line, i):