Merge branch 'master' of github.com:tijme/angularjs-csti-scanner

Author: tijme

acstis/Driver.py

@@ -53,7 +53,7 @@ class Driver:
     vulnerable_requests = []
 
     def __init__(self, uri, verify_exploit, use_crawler, quit_if_vulnerable):
-        Logging.info("Started scan");
+        Logging.info("Started scan")
 
         self.input_uri = uri
         self.input_verify_exploit = verify_exploit
@@ -74,7 +74,7 @@ def __init__(self, uri, verify_exploit, use_crawler, quit_if_vulnerable):
         self.crawler_options.performance.max_threads = 12
 
         try:
-            self.website_details = Scraper.get_details(self.input_uri);
+            self.website_details = Scraper.get_details(self.input_uri)
         except Exception as e:
             Logging.red("Error while scraping URL '{}': {}".format(self.input_uri, str(e)))
             sys.exit(1)
@@ -92,7 +92,7 @@ def __init__(self, uri, verify_exploit, use_crawler, quit_if_vulnerable):
             sys.exit(1)
 
     def cb_crawler_before_start(self):
-        Logging.info("Started crawler");
+        Logging.info("Started crawler")
 
     def cb_crawler_after_finish(self, queue):
         Logging.info("Found {} vulnerable URI(s)".format(len(self.vulnerable_requests)))
@@ -103,7 +103,7 @@ def cb_request_before_start(self, queue, queue_item):
         result = Exploit.is_vulnerable(queue_item, self.website_details["angular_version"], self.input_verify_exploit)
 
         if result is not False:
-            self.vulnerable_requests.append(result);
+            self.vulnerable_requests.append(result)
             Logging.red("Request is vulnerable [" + result.request.method + "] " + result.request.url + " (PostData: " + str(result.request.data) + ")")
 
             if self.input_quit_if_vulnerable:
@@ -112,4 +112,4 @@ def cb_request_before_start(self, queue, queue_item):
         return CrawlerActions.DO_CONTINUE_CRAWLING
 
     def cb_request_after_finish(self, queue, queue_item, new_queue_items):
-        return CrawlerActions.DO_CONTINUE_CRAWLING
+        return CrawlerActions.DO_CONTINUE_CRAWLING

acstis/Logging.py

@@ -30,16 +30,16 @@ class Logging:
 
     @staticmethod
     def info(message):
-        print(Back.BLACK + str(datetime.datetime.now()) + ": " + message);
+        print(Back.BLACK + str(datetime.datetime.now()) + ": " + message)
 
     @staticmethod
     def red(message):
-        print(Fore.RED + Back.BLACK + str(datetime.datetime.now()) + ": " + message);
+        print(Fore.RED + Back.BLACK + str(datetime.datetime.now()) + ": " + message)
 
     @staticmethod
     def green(message):
-        print(Fore.GREEN + Back.BLACK + str(datetime.datetime.now()) + ": " + message);
+        print(Fore.GREEN + Back.BLACK + str(datetime.datetime.now()) + ": " + message)
 
     @staticmethod
     def yellow(message):
-        print(Fore.YELLOW + Back.BLACK + str(datetime.datetime.now()) + ": " + message);
+        print(Fore.YELLOW + Back.BLACK + str(datetime.datetime.now()) + ": " + message)

acstis/Selenium.py

@@ -38,7 +38,7 @@ def execute_js(url, command):
         browser.get(url)
 
         try:
-            response = browser.execute_script(command);
+            response = browser.execute_script(command)
         except Exception:
             response = None
 
@@ -84,4 +84,4 @@ def get_chrome_driver():
         elif platform == "darwin":
             return path + "/chrome_drivers/chromedriver_mac64"
         elif platform == "win32":
-            return path + "/chrome_drivers/chromedriver_win32"
+            return path + "/chrome_drivers/chromedriver_win32"