Attachment 5359 Details for Bug 32183

[patch] squid_ldap_ntlm_auth.patch

squid_ldap_ntlm_auth.patch (text/plain), 1.45 KB, created by Felix Botner on 2013-08-07 17:57 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Botner

Created: 2013-08-07 17:57 CEST

Size: 1.45 KB

patch

obsolete

>Index: squid_ldap_ntlm_auth
>===================================================================
>--- squid_ldap_ntlm_auth	(Revision 42908)
>+++ squid_ldap_ntlm_auth	(Arbeitskopie)
>@@ -505,13 +505,16 @@
> 
> 	return tt, challenge
> 
>-# YR TlRMTVNTUAABAAAAB7IIogUABQAsAAAABAAEACgAAAAFASgKAAAAD1RFU1RTUVVJRJ==
>-def ntlmTypeOne(data):
>+def ntlmType(data):
> 
> 	if options.debug:
>-		debug("NTLM Type 1 Message: ")
>+		debug("Checking NTLM Type: ")
> 
>-	data = data.replace("YR ", "", 1)
>+	if data.startswith("YR "):
>+		data = data.replace("YR ", "", 1)
>+	elif data.startswith("KK "):
>+		data = data.replace("KK ", "", 1)
>+
> 	signature = ""
> 	type = ""
> 	flags = ""
>@@ -530,9 +533,9 @@
> 	except:
> 		pass
> 
>-	if signature.startswith("NTLMSSP") and type == 1:
>-		return True
>-	return False
>+	if signature.startswith("NTLMSSP") and type:
>+		return type
>+	return 0
> 
> # tests
> 
>@@ -627,11 +630,19 @@
> 
> 		if data:
> 			if data.startswith("YR "): 
>-				if ntlmTypeOne(data):
>+				ntype = ntlmType(data)
>+				if ntype == 1:
> 					try:
> 						answer, challenge = createNtlmTypeTwo()
> 					except Exception, e:
> 						answer = "BH failed to createNtlmTypeTwo(): %s" % e
>+				# office 2013 workaround
>+				elif ntype == 3:
>+					try:
>+						data = data.replace("YR ", "", 1)
>+						answer = verifyNtlmTypeThree(data, challenge)
>+					except Exception, e:
>+						answer = "BH failed to verifyNtlmTypeThree(): %s" % e
> 				else:
> 					if options.debug:
> 						debug("negotiate kerberos authentication" + data)

Actions: View | Diff

Attachments on bug 32183: 5359 | 5384 | 5385