Merge remote-tracking branch 'upstream/develop' into attack_system_info

monkey/infection_monkey/exploit/web_rce.py

@@ -210,6 +210,7 @@ class WebRCE(HostExploiter):
         for url in urls:
             if self.check_if_exploitable(url):
                 self.add_vuln_url(url)
+                self.vulnerable_urls.append(url)
                 if stop_checking:
                     break
         if not self.vulnerable_urls:

monkey/monkey_island/cc/resources/attack/attack_report.py

@@ -1,7 +1,7 @@
 import flask_restful
 from flask import jsonify
-from cc.auth import jwt_required
-from cc.services.attack.attack_report import AttackReportService
+from monkey_island.cc.auth import jwt_required
+from monkey_island.cc.services.attack.attack_report import AttackReportService
 
 __author__ = "VakarisZ"
 

monkey/monkey_island/cc/resources/root.py

@@ -8,7 +8,7 @@ from monkey_island.cc.auth import jwt_required
 from monkey_island.cc.database import mongo
 from monkey_island.cc.services.node import NodeService
 from monkey_island.cc.services.report import ReportService
-from cc.services.attack.attack_report import AttackReportService
+from monkey_island.cc.services.attack.attack_report import AttackReportService
 from monkey_island.cc.utils import local_ip_addresses
 from monkey_island.cc.services.database import Database