diff --git a/deployment_scripts/README.md b/deployment_scripts/README.md
index 92a2fd76e..10027edce 100644
--- a/deployment_scripts/README.md
+++ b/deployment_scripts/README.md
@@ -13,9 +13,10 @@ Don't forget to add python to PATH or do so while installing it via this script.
## Linux
-You must have root permissions, but there is no need to run the script as root.
+You must have root permissions, but don't run the script as root.
Launch deploy_linux.sh from scripts directory.
-First argument is an empty directory (script can create one) and second is branch you want to clone.
+First argument should be an empty directory (script can create one, default is ./infection_monkey) and second is the branch you want to clone (develop by default).
+Choose a directory where you have all the relevant permissions, for e.g. /home/your_username
Example usages:
./deploy_linux.sh (deploys under ./infection_monkey)
./deploy_linux.sh "/home/test/monkey" (deploys under /home/test/monkey)
diff --git a/monkey/monkey_island/cc/models/monkey.py b/monkey/monkey_island/cc/models/monkey.py
index 520b967a0..0b910c84b 100644
--- a/monkey/monkey_island/cc/models/monkey.py
+++ b/monkey/monkey_island/cc/models/monkey.py
@@ -32,6 +32,7 @@ class Monkey(Document):
critical_services = ListField(StringField())
pba_results = ListField()
ttl_ref = ReferenceField(MonkeyTtl)
+ tunnel = ReferenceField("self")
# LOGIC
@staticmethod
diff --git a/monkey/monkey_island/cc/services/report.py b/monkey/monkey_island/cc/services/report.py
index 9ceb9662a..593bbfdaf 100644
--- a/monkey/monkey_island/cc/services/report.py
+++ b/monkey/monkey_island/cc/services/report.py
@@ -373,8 +373,13 @@ class ReportService:
@staticmethod
def get_exploits():
+ query = [{'$match': {'telem_category': 'exploit', 'data.result': True}},
+ {'$group': {'_id': {'ip_address': '$data.machine.ip_addr'},
+ 'data': {'$first': '$$ROOT'},
+ }},
+ {"$replaceRoot": {"newRoot": "$data"}}]
exploits = []
- for exploit in mongo.db.telemetry.find({'telem_category': 'exploit', 'data.result': True}):
+ for exploit in mongo.db.telemetry.aggregate(query):
new_exploit = ReportService.process_exploit(exploit)
if new_exploit not in exploits:
exploits.append(new_exploit)
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js b/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
index e67b40728..1008199fc 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
@@ -241,7 +241,7 @@ class RunMonkeyPageComponent extends AuthComponent {
- Not sure what this is? Not seeing your AWS EC2 instances? Read the documentation! + Not sure what this is? Not seeing your AWS EC2 instances? Read the documentation!