From af5e791e1befd56501539ff7d774934a1bca10d8 Mon Sep 17 00:00:00 2001
From: itay <itay.mizeretz@guardicore.com>
Date: Mon, 18 Feb 2019 11:40:15 +0200
Subject: [PATCH 1/3] postbreach actions disabled by default

---
 monkey/monkey_island/cc/services/config_schema.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/monkey/monkey_island/cc/services/config_schema.py b/monkey/monkey_island/cc/services/config_schema.py
index 7b857b109..ee26f487b 100644
--- a/monkey/monkey_island/cc/services/config_schema.py
+++ b/monkey/monkey_island/cc/services/config_schema.py
@@ -304,7 +304,6 @@ SCHEMA = {
                                 "$ref": "#/definitions/post_breach_acts"
                             },
                             "default": [
-                                "BackdoorUser",
                             ],
                             "description": "List of actions the Monkey will run post breach"
                         },

From f5b9c6fe4603a52ee27aaff7567acf3398e3cbc5 Mon Sep 17 00:00:00 2001
From: itay <itay.mizeretz@guardicore.com>
Date: Mon, 18 Feb 2019 11:53:52 +0200
Subject: [PATCH 2/3] Show AWS info regardless of failed auth

---
 .../cc/ui/src/components/pages/RunMonkeyPage.js  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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 2cca7698c..55e7279c0 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
@@ -327,17 +327,19 @@ class RunMonkeyPageComponent extends AuthComponent {
               </div>
             </div>
           </div>
+            <div className="col-sm-8 col-sm-offset-2" style={{'fontSize': '1.2em'}}>
+              <p className="alert alert-info">
+                <i className="glyphicon glyphicon-info-sign" style={{'marginRight': '5px'}}/>
+                In order to remotely run commands on AWS EC2 instances, please make sure you have
+                the <a href="https://docs.aws.amazon.com/console/ec2/run-command/prereqs" target="_blank">prerequisites</a> and if the
+                instances don't show up, check the
+                AWS <a href="https://docs.aws.amazon.com/console/ec2/run-command/troubleshooting" target="_blank">troubleshooting guide</a>.
+              </p>
+            </div>
             {
               this.state.awsUpdateFailed ?
                 <div className="col-sm-8 col-sm-offset-2" style={{'fontSize': '1.2em'}}>
                   <p className="alert alert-danger" role="alert">Authentication failed.</p>
-                  <p className="alert alert-info">
-                    <i className="glyphicon glyphicon-info-sign" style={{'marginRight': '5px'}}/>
-                    In order to remotely run commands on AWS EC2 instances, please make sure you have
-                    the <a href="https://docs.aws.amazon.com/console/ec2/run-command/prereqs" target="_blank">prerequisites</a> and if the
-                    instances don't show up, check the
-                    AWS <a href="https://docs.aws.amazon.com/console/ec2/run-command/troubleshooting" target="_blank">troubleshooting guide</a>.
-                  </p>
                 </div>
                 :
                 null

From 759cbcd6aeac3a2a656d11d49a2649a5c7be2466 Mon Sep 17 00:00:00 2001
From: itay <itay.mizeretz@guardicore.com>
Date: Mon, 18 Feb 2019 12:23:13 +0200
Subject: [PATCH 3/3] Hotfix telemetry feed accessing non-existent monkey_guid

---
 monkey/monkey_island/cc/resources/telemetry_feed.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/monkey/monkey_island/cc/resources/telemetry_feed.py b/monkey/monkey_island/cc/resources/telemetry_feed.py
index ee9fe7e8f..deeb0f4da 100644
--- a/monkey/monkey_island/cc/resources/telemetry_feed.py
+++ b/monkey/monkey_island/cc/resources/telemetry_feed.py
@@ -31,11 +31,13 @@ class TelemetryFeed(flask_restful.Resource):
 
     @staticmethod
     def get_displayed_telemetry(telem):
+        monkey = NodeService.get_monkey_by_guid(telem['monkey_guid'])
+        default_hostname = "GUID-" + telem['monkey_guid']
         return \
             {
                 'id': telem['_id'],
                 'timestamp': telem['timestamp'].strftime('%d/%m/%Y %H:%M:%S'),
-                'hostname': NodeService.get_monkey_by_guid(telem['monkey_guid']).get('hostname','missing'),
+                'hostname': monkey.get('hostname', default_hostname) if monkey else default_hostname,
                 'brief': TELEM_PROCESS_DICT[telem['telem_type']](telem)
             }