From 908c531696cd0e61274f6e7442fad0a25793d6e1 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Mon, 10 Jun 2019 11:31:04 +0300
Subject: [PATCH] command line implementation finished

---
 .../cc/services/attack/technique_reports/T1059.py        | 2 +-
 .../cc/ui/src/components/attack/techniques/T1059.js      | 9 +++++----
 .../ui/src/components/report-components/AttackReport.js  | 4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1059.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1059.py
index bf29247fd..330b13c71 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1059.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1059.py
@@ -22,7 +22,7 @@ class T1059(AttackTechnique):
     @staticmethod
     def get_report_data():
         cmd_data = list(mongo.db.telemetry.aggregate(T1059.query))
-        data = {'title': T1059.technique_title(T1059.tech_id), 'data': cmd_data}
+        data = {'title': T1059.technique_title(T1059.tech_id), 'cmds': cmd_data}
         if cmd_data:
             data.update({'message': T1059.used_msg, 'status': ScanStatus.USED.name})
         else:
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js
index 1cf93065f..4a65ee34a 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js
@@ -13,8 +13,9 @@ class T1059 extends React.Component {
   static getHashColumns() {
     return ([{
       columns: [
-        {Header: 'Machine', id: 'machine', accessor: x => RenderMachine(x.machine), style: { 'whiteSpace': 'unset' }},
-        {Header: 'Command', id: 'command', accessor: x => x.attempts[0].hashType, style: { 'whiteSpace': 'unset' }},
+        {Header: 'Machine', id: 'machine', accessor: x => RenderMachine(x.data[0].machine), style: { 'whiteSpace': 'unset'}, width: 160 },
+        {Header: 'Approx. Time', id: 'time', accessor: x => x.data[0].info.finished, style: { 'whiteSpace': 'unset' }},
+        {Header: 'Command', id: 'command', accessor: x => x.data[0].info.executed_cmds[0], style: { 'whiteSpace': 'unset' }},
         ]
     }])};
 
@@ -26,9 +27,9 @@ class T1059 extends React.Component {
         {this.props.data.status === 'USED' ?
           <ReactTable
               columns={T1059.getHashColumns()}
-              data={this.props.data.successful_logins}
+              data={this.props.data.cmds}
               showPagination={false}
-              defaultPageSize={this.props.data.successful_logins.length}
+              defaultPageSize={this.props.data.cmds.length}
           /> : ""}
       </div>
     );
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js b/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js
index b10b1ff7d..20250873a 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js
@@ -10,13 +10,15 @@ import T1197 from '../attack/techniques/T1197';
 import T1110 from '../attack/techniques/T1110';
 import T1075 from "../attack/techniques/T1075";
 import T1003 from "../attack/techniques/T1003";
+import T1059 from "../attack/techniques/T1059";
 
 const tech_components = {
   'T1210': T1210,
   'T1197': T1197,
   'T1110': T1110,
   'T1075': T1075,
-  'T1003': T1003
+  'T1003': T1003,
+  'T1059': T1059
 };
 
 const classNames = require('classnames');