From 299696194378f0693d309c8037c1e6cf2189c6ef Mon Sep 17 00:00:00 2001
From: Alessandro ZANNI <alessandro.zanni@bt.com>
Date: Tue, 18 Oct 2016 17:48:21 +0200
Subject: [PATCH] uniform dictionary keys to store passwords / hash in the db

---
 pupy/modules/mimikatz_powershell.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pupy/modules/mimikatz_powershell.py b/pupy/modules/mimikatz_powershell.py
index e1192fa7..b3992063 100644
--- a/pupy/modules/mimikatz_powershell.py
+++ b/pupy/modules/mimikatz_powershell.py
@@ -108,15 +108,17 @@ Invoke-Mimikatz -Command "privilege::debug exit" -ComputerName "computer1"
                         domain = hostDomain
                         sid = domainSid
 
+                    category = ''
                     if self.validate_ntlm(password):
-                        credType = "hash"
+                        credType = "Hash"
+                        category = 'NTLM hash'
 
                     else:
-                        credType = "password"
-
+                        credType = "Password"
+                        category = 'System password'
                     # ignore machine account plaintexts
-                    if not (credType == "password" and username.endswith("$")):
-                        creds.append({'domain': domain, 'user': username, credType:password, 'hostName': hostName, 'sid':sid, 'Tool': 'mimikatz'})
+                    if not (credType == "Password" and username.endswith("$")):
+                        creds.append({'Domain': domain, 'Login': username, credType:password, 'CredType': credType.lower(), 'Host': hostName, 'sid':sid, 'Category': category, 'uid': self.client.short_name()})
 
         if len(creds) == 0:
             # check if we have lsadump output to check for krbtgt
@@ -142,7 +144,7 @@ Invoke-Mimikatz -Command "privilege::debug exit" -ComputerName "computer1"
                                 break
 
                         if krbtgtHash != "":
-                            creds.append({'domain': domain, 'user': user, 'krbtgt hash': krbtgtHash, 'hostName': hostName, 'sid':sid, 'Tool': 'mimikatz'})
+                            creds.append({'Domain': domain, 'Login': user, 'Hash': krbtgtHash, 'Host': hostName, 'CredType': 'hash', 'sid':sid, 'Category': 'krbtgt hash', 'uid': self.client.short_name()})
                     except Exception as e:
                         pass
 
@@ -167,7 +169,7 @@ Invoke-Mimikatz -Command "privilege::debug exit" -ComputerName "computer1"
                         pass
 
                 if domain != "" and userHash != "":
-                    creds.append({'domain': domain, 'user': user, 'hash': userHash, 'dcName': dcName, 'sid':sid, 'Tool': 'mimikatz'})
+                    creds.append({'Domain': domain, 'Login': user, 'Hash': userHash, 'Host': dcName, 'CredType': 'hash', 'SID':sid, 'Category': 'NTLM hash', 'uid': self.client.short_name()})
 
         return creds