From be26b504b5133c78158d9794cd361ce1a7418775 Mon Sep 17 00:00:00 2001
From: lgandx <laurent.gaffie@gmail.com>
Date: Mon, 4 Sep 2017 21:57:51 -0300
Subject: [PATCH] Fixed various bugs and improved the LDAP module.

---
 servers/LDAP.py         | 32 +++++++++++++++++++++++++-------
 tools/DHCP_Auto.sh      |  0
 tools/FindSMB2UPTime.py |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 tools/DHCP_Auto.sh

diff --git a/servers/LDAP.py b/servers/LDAP.py
index d25d88f..6c6e612 100644
--- a/servers/LDAP.py
+++ b/servers/LDAP.py
@@ -102,19 +102,37 @@ def ParseLDAPPacket(data, client, Challenge):
 		elif Operation == "\x63":
 			Buffer = ParseSearch(data)
 			return Buffer
+
 		elif settings.Config.Verbose:
 			print text('[LDAP] Operation not supported')
 
+	if data[5:6] == '\x60':
+                UserLen = struct.unpack("<b",data[11:12])[0]
+                UserString = data[12:12+UserLen]
+                PassLen = struct.unpack("<b",data[12+UserLen+1:12+UserLen+2])[0]
+                PassStr = data[12+UserLen+2:12+UserLen+3+PassLen]
+                if settings.Config.Verbose:
+			print text('[LDAP] Attempting to parse an old simple Bind request.')
+		SaveToDb({
+			'module': 'LDAP',
+			'type': 'Cleartext',
+			'client': client,
+			'user': UserString,
+			'cleartext': PassStr,
+			'fullhash': UserString+':'+PassStr,
+			})
+
 class LDAP(BaseRequestHandler):
 	def handle(self):
 		try:
-			while True:
-				self.request.settimeout(0.5)
-				data = self.request.recv(8092)
-                                Challenge = RandomChallenge()
+			self.request.settimeout(0.4)
+			data = self.request.recv(8092)
+                        Challenge = RandomChallenge()
+                        for x in range(5):
 				Buffer = ParseLDAPPacket(data,self.client_address[0], Challenge)
-
 				if Buffer:
 					self.request.send(Buffer)
-		except socket.timeout:
-			pass
+				data = self.request.recv(8092)
+		except:
+                        pass
+
diff --git a/tools/DHCP_Auto.sh b/tools/DHCP_Auto.sh
old mode 100644
new mode 100755
diff --git a/tools/FindSMB2UPTime.py b/tools/FindSMB2UPTime.py
index b5c1682..22f3f82 100755
--- a/tools/FindSMB2UPTime.py
+++ b/tools/FindSMB2UPTime.py
@@ -39,7 +39,7 @@ def IsDCVuln(t):
     if t[0] < Date:
        print "System is up since:", t[1]
        print "This system may be vulnerable to MS17-010"
-     print "DC is up since:", t[1]
+    print "DC is up since:", t[1]
 
 
 def run(host):