Attachment 8140 Details for Bug 42310 – patch

[patch] patch

42310.patch (text/plain), 1.93 KB, created by Florian Best on 2016-10-20 12:49:47 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-10-20 12:49:47 CEST

Size: 1.93 KB

patch

obsolete

>diff --git a/management/univention-management-console/src/univention/management/console/auth.py b/management/univention-management-console/src/univention/management/console/auth.py
>index ec6ee93..28f9509 100644
>--- a/management/univention-management-console/src/univention/management/console/auth.py
>+++ b/management/univention-management-console/src/univention/management/console/auth.py
>@@ -36,14 +36,14 @@
> import traceback
> 
> import ldap
>-from ldap.filter import escape_filter_chars
>+from ldap.filter import filter_format
> 
> import notifier
> import notifier.signals as signals
> import notifier.threads as threads
> 
>-from univention.uldap import getMachineConnection
> from univention.management.console.log import AUTH
>+from univention.management.console.ldap import get_machine_connection
> from univention.management.console.pam import PamAuth, AuthenticationError, AuthenticationFailed, AuthenticationInformationMissing, PasswordExpired, AccountExpired, PasswordChangeFailed
> 
> 
>@@ -127,14 +127,13 @@ def __authenticate_thread(self, username, password, new_password, **custom_promp
> 
> 	def __canonicalize_username(self, username):
> 		try:
>-			lo = getMachineConnection()
>+			lo, po = get_machine_connection(write=False)
> 			attr = 'mailPrimaryAddress' if '@' in username else 'uid'
>-			result = lo.search('%s=%s' % (attr, escape_filter_chars(username)), attr=['uid'], unique=True)
>+			result = lo.search(filter_format('(&(%s=%s)(objectClass=person))', (attr, username)), attr=['uid'], unique=True)
> 			if result and result[0][1].get('uid'):
> 				username = result[0][1]['uid'][0]
>-				AUTH.info('Canonicalized username; %r' % (username,))
>-			lo.lo.unbind()
>-		except (ldap.LDAPError, IOError) as exc:
>+				AUTH.info('Canonicalized username: %r' % (username,))
>+		except (ldap.LDAPError, IOError, AttributeError) as exc:
> 			# /etc/machine.secret missing or LDAP server not reachable
> 			AUTH.warn('Canonicalization of username was not possible: %s' % (exc,))
> 		except:

Actions: View | Diff

Attachments on bug 42310: 8139 | 8140