From ee7051fdea214957cc7362cecd3737601594b57b Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 13 May 2020 12:45:19 +0300
Subject: [PATCH] Smallfixes on persistance/create user attack technique

---
 .../cc/services/attack/attack_schema.py       | 32 +++++++++----------
 .../attack/technique_reports/T1136.py         |  2 +-
 .../src/components/attack/techniques/T1136.js |  4 ++-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/monkey/monkey_island/cc/services/attack/attack_schema.py b/monkey/monkey_island/cc/services/attack/attack_schema.py
index a49079fa4..3c3a451f2 100644
--- a/monkey/monkey_island/cc/services/attack/attack_schema.py
+++ b/monkey/monkey_island/cc/services/attack/attack_schema.py
@@ -66,6 +66,22 @@ SCHEMA = {
                 }
             }
         },
+        "persistence": {
+            "title": "Persistence",
+            "type": "object",
+            "link": "https://attack.mitre.org/tactics/TA0003/",
+            "properties": {
+                "T1136": {
+                    "title": "Create account",
+                    "type": "bool",
+                    "value": True,
+                    "necessary": False,
+                    "link": "https://attack.mitre.org/techniques/T1136",
+                    "description": "Adversaries with a sufficient level of access "
+                                    "may create a local system, domain, or cloud tenant account."
+                }
+            }
+        },
         "defence_evasion": {
             "title": "Defence evasion",
             "type": "object",
@@ -289,22 +305,6 @@ SCHEMA = {
                     "description": "Data exfiltration is performed over the Command and Control channel."
                 }
             }
-        },
-        "persistence": {
-            "title": "Persistence",
-            "type": "object",
-            "link": "https://attack.mitre.org/tactics/TA0003/",
-            "properties": {
-                "T1136": {
-                    "title": "Create account",
-                    "type": "bool",
-                    "value": True,
-                    "necessary": False,
-                    "link": "https://attack.mitre.org/techniques/T1136",
-                    "description": "Adversaries with a sufficient level of access "
-                                    "may create a local system, domain, or cloud tenant account."
-                }
-            }
         }
     }
 }
diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1136.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1136.py
index 04450d4a6..4cd78c9a3 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1136.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1136.py
@@ -34,5 +34,5 @@ class T1136(AttackTechnique):
                                 'result': ': '.join([pba['name'], pba['result'][0]])
                             }]
                         })
-            data.update(T1136.get_message_and_status(status))
+            data.update(T1136.get_base_data_by_status(status))
         return data
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1136.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1136.js
index b9c4b6aff..55cd9966c 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1136.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1136.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactTable from 'react-table';
-import {renderMachineFromSystemData, ScanStatus} from './Helpers'
+import {renderMachineFromSystemData, ScanStatus} from './Helpers';
+import MitigationsComponent from "./MitigationsComponent";
 
 class T1136 extends React.Component {
 
@@ -35,6 +36,7 @@ class T1136 extends React.Component {
             showPagination={false}
             defaultPageSize={this.props.data.info.length}
           /> : ''}
+          <MitigationsComponent mitigations={this.props.data.mitigations}/>
       </div>
     );
   }