From 0284eeebe8e71619266526559a6e191f75b8ddb8 Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Thu, 30 May 2019 17:02:30 +0300 Subject: [PATCH 1/3] Import made compatible with attack config --- .../monkey_island/cc/ui/src/components/pages/ConfigurePage.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js index 75d2b1c93..44d5a9a2b 100644 --- a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js +++ b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js @@ -299,9 +299,8 @@ class ConfigurePageComponent extends AuthComponent { try { this.setState({ configuration: JSON.parse(event.target.result), - selectedSection: 'basic', lastAction: 'import_success' - }, () => {this.sendConfig()}); + }, () => {this.sendConfig(); this.setInitialConfig(JSON.parse(event.target.result))}); this.currentSection = 'basic'; this.currentFormData = {}; } catch(SyntaxError) { From 85ff5bd4ecc145b5e0cdd548468d7d4e68dc11d2 Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Tue, 11 Jun 2019 14:49:18 +0300 Subject: [PATCH 2/3] bug in web_rce fixed --- monkey/infection_monkey/exploit/web_rce.py | 1 + 1 file changed, 1 insertion(+) diff --git a/monkey/infection_monkey/exploit/web_rce.py b/monkey/infection_monkey/exploit/web_rce.py index 2b08575c3..d31df7c21 100644 --- a/monkey/infection_monkey/exploit/web_rce.py +++ b/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: From 16306f86bbb7066c4a4666a411f99d6a6cc08cab Mon Sep 17 00:00:00 2001 From: itay Date: Tue, 11 Jun 2019 19:45:03 +0300 Subject: [PATCH 3/3] fix imports --- monkey/monkey_island/cc/resources/attack/attack_report.py | 4 ++-- monkey/monkey_island/cc/resources/root.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monkey/monkey_island/cc/resources/attack/attack_report.py b/monkey/monkey_island/cc/resources/attack/attack_report.py index 714836925..a55137d7e 100644 --- a/monkey/monkey_island/cc/resources/attack/attack_report.py +++ b/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" diff --git a/monkey/monkey_island/cc/resources/root.py b/monkey/monkey_island/cc/resources/root.py index f57235feb..2af73a45e 100644 --- a/monkey/monkey_island/cc/resources/root.py +++ b/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