From 60df88b78e139122046a082883c87aaac19be1a1 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 11 Feb 2024 19:48:44 +0000 Subject: ldap: Fix catching exceptions --- accounts/backend/user/ldap.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/accounts/backend/user/ldap.py b/accounts/backend/user/ldap.py index 61bd445..24e9f93 100644 --- a/accounts/backend/user/ldap.py +++ b/accounts/backend/user/ldap.py @@ -4,6 +4,7 @@ import ldap3 from ldap3.utils.conv import escape_filter_chars from ldap3.utils.dn import escape_rdn +from ldap3.core.exceptions import LDAPInvalidCredentialsResult, LDAPException from . import Backend, InvalidPasswordError, NoSuchUserError, ShouldNotHappen from accounts.models import Account @@ -25,7 +26,7 @@ def _change_password(conn, dn, passwords, as_admin=False): try: conn.extend.standard.modify_password(dn, old_password, new_password) - except ldap3.LDAPException: + except LDAPException: raise InvalidPasswordError('Invalid password') @@ -93,7 +94,7 @@ class LdapBackend(Backend): for entry in conn.entries: accounts.append(Account(entry.uid.value, entry.mail.value, uidNumber=entry.uidNumber.value)) - except ldap3.LDAPException: + except LDAPException: pass return accounts @@ -163,7 +164,7 @@ class LdapBackend(Backend): try: conn.bind() - except ldap3.LDAPInvalidCredentialsResult: + except LDAPInvalidCredentialsResult: raise InvalidPasswordError('Invalid password') return conn -- cgit v1.2.3-1-g7c22