From 48abfcab6831ad94618ff6d007a79a58810a49e3 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Thu, 19 Mar 2020 15:05:27 +0200
Subject: [PATCH] Fixed credential dumping

---
 .../cc/services/attack/technique_reports/T1003.py              | 3 +++
 .../cc/ui/src/components/attack/techniques/T1003.js            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1003.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1003.py
index 8039a2e76..f3bd9b180 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1003.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1003.py
@@ -1,4 +1,5 @@
 from monkey_island.cc.services.attack.technique_reports import AttackTechnique
+from monkey_island.cc.services.reporting.report import ReportService
 from common.utils.attack_utils import ScanStatus
 from monkey_island.cc.database import mongo
 
@@ -23,4 +24,6 @@ class T1003(AttackTechnique):
         else:
             status = ScanStatus.UNSCANNED.value
         data.update(T1003.get_message_and_status(status))
+        data['stolen_creds'] = ReportService.get_stolen_creds()
+        data['stolen_creds'].extend(ReportService.get_ssh_keys())
         return data
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
index 5615c7039..c9c127574 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
@@ -17,7 +17,7 @@ class T1003 extends React.Component {
         <br/>
         {this.props.data.status === ScanStatus.USED ?
           <StolenPasswordsComponent
-            data={this.props.reportData.glance.stolen_creds.concat(this.props.reportData.glance.ssh_keys)}/>
+            data={this.props.data.stolen_creds}/>
           : ''}
       </div>
     );