From 8923016cbcf0c0b139bab23e43cf7a8539205bc8 Mon Sep 17 00:00:00 2001
From: jrmdev <jeremy.saintot@gmail.com>
Date: Fri, 17 Jul 2015 15:30:29 +1000
Subject: [PATCH] Some fixes

---
 servers/HTTP_Proxy.py |  2 +-
 servers/SMB.py        | 42 +++++++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/servers/HTTP_Proxy.py b/servers/HTTP_Proxy.py
index 330bb5c..f66a505 100644
--- a/servers/HTTP_Proxy.py
+++ b/servers/HTTP_Proxy.py
@@ -68,7 +68,7 @@ def InjectData(data, client, req_uri):
 				Headers = Headers.replace("Content-Length: "+Len, "Content-Length: "+ str(len(Content)))
 
 		if "content-encoding: gzip" in Headers.lower():
-			Content = zlib.compress(lContent)
+			Content = zlib.compress(Content)
 
 		data = Headers +'\r\n'+ Content
 
diff --git a/servers/SMB.py b/servers/SMB.py
index a0c36a6..3abb2ba 100644
--- a/servers/SMB.py
+++ b/servers/SMB.py
@@ -174,22 +174,42 @@ def ParseLMNTHash(data, client):
 		FullHash = data[65+LMhashLen:65+LMhashLen+NthashLen].encode('hex')
 		LmHash = FullHash[:32].upper()
 		NtHash = FullHash[32:].upper()
-	
-		print text("[SMB] NTLMv2 Address  : %s" % client)
-		print text("[SMB] NTLMv2 Username : %s\\%s" % (Domain, Username))
-		print text("[SMB] NTLMv2 Hash     : %s" % NtHash)
 		WriteHash = '%s::%s:%s:%s:%s' % (Username, Domain, settings.Config.NumChal, LmHash, NtHash)
-		WriteData(settings.Config.SMBNTLMv2Log % client, WriteHash, Username+"::"+Domain)
+	
+		SaveToDb({
+			'module': 'SMB', 
+			'type': 'NTLMv2', 
+			'client': client, 
+			'user': Domain+'\\'+Username, 
+			'hash': NtHash, 
+			'fullhash': WriteHash,
+		})
+
+		#print text("[SMB] NTLMv2 Address  : %s" % client)
+		#print text("[SMB] NTLMv2 Username : %s\\%s" % (Domain, Username))
+		#print text("[SMB] NTLMv2 Hash     : %s" % NtHash)
+		#WriteHash = '%s::%s:%s:%s:%s' % (Username, Domain, settings.Config.NumChal, LmHash, NtHash)
+		#WriteData(settings.Config.SMBNTLMv2Log % client, WriteHash, Username+"::"+Domain)
 
 	if NthashLen == 24:
 		NtHash = data[65+LMhashLen:65+LMhashLen+NthashLen].encode('hex').upper()
 		LmHash = data[65:65+LMhashLen].encode('hex').upper()
-
-		print text("[SMB] NTLMv1 Address  : %s" % client)
-		print text("[SMB] NTLMv1 Username : %s\\%s" % (Domain, Username))
-		print text("[SMB] NTLMv1 Hash     : %s" % NtHash)
 		WriteHash = '%s::%s:%s:%s:%s' % (Username, Domain, LmHash, NtHash, settings.Config.NumChal)
-		WriteData(settings.Config.SMBNTLMv1Log % client, WriteHash, Username+"::"+Domain)
+
+		SaveToDb({
+			'module': 'SMB', 
+			'type': 'NTLMv1', 
+			'client': client, 
+			'user': Domain+'\\'+Username, 
+			'hash': NtHash, 
+			'fullhash': WriteHash,
+		})
+
+		#print text("[SMB] NTLMv1 Address  : %s" % client)
+		#print text("[SMB] NTLMv1 Username : %s\\%s" % (Domain, Username))
+		#print text("[SMB] NTLMv1 Hash     : %s" % NtHash)
+		#WriteHash = '%s::%s:%s:%s:%s' % (Username, Domain, LmHash, NtHash, settings.Config.NumChal)
+		#WriteData(settings.Config.SMBNTLMv1Log % client, WriteHash, Username+"::"+Domain)
 
 def IsNT4ClearTxt(data, client):
 	HeadLen = 36
@@ -387,4 +407,4 @@ class SMB1LM(BaseRequestHandler):
 
 		except Exception:
 			self.request.close()
-			pass
\ No newline at end of file
+			pass