Merge branch 'develop'

Author: tijme

Diff for: acstis/Driver.py

@@ -24,7 +24,8 @@
 
 from nyawc.Options import Options
 from nyawc.Queue import QueueItem
-from nyawc.Crawler import Crawler, CrawlerActions
+from nyawc.Crawler import Crawler
+from nyawc.CrawlerActions import CrawlerActions
 from nyawc.http.Request import Request
 from acstis.Logging import Logging
 from acstis.Exploit import Exploit
@@ -67,7 +68,6 @@ def __init__(self, uri, verify_exploit, use_crawler, quit_if_vulnerable):
         self.crawler_options.scope.protocol_must_match = False
         self.crawler_options.scope.subdomain_must_match = True
         self.crawler_options.scope.domain_must_match = True
-        self.crawler_options.scope.ignore_similar_requests = True
         self.crawler_options.scope.max_depth = 0 if not self.input_use_crawler else None 
 
         self.crawler_options.performance.max_threads = 8
@@ -94,6 +94,8 @@ def cb_crawler_after_finish(self, queue):
         Logging.info("Found {} vulnerable URI(s)".format(len(self.vulnerable_requests)))
 
     def cb_request_before_start(self, queue, queue_item):
+        Logging.info("Checking {}".format(queue_item.request.url))
+        
         result = Exploit.is_vulnerable(queue_item, self.website_details["angular_version"], self.input_verify_exploit)
 
         if result is not False:

Diff for: requirements.txt

@@ -2,4 +2,4 @@ beautifulsoup4==4.5.3
 colorama==0.3.7
 selenium==3.0.2
 requests==2.13.0
-nyawc==1.3.0
+nyawc==1.4.1

Diff for: setup.py

@@ -28,7 +28,7 @@
     requirements = file.read().splitlines()
 
 setup(
-    version ="2.0.5",   
+    version ="2.0.6",   
     name = "acstis",
     description = "Automated client-side template injection (CSTI, sandbox escape/bypass) detection for AngularJS!",
     long_description = "",