summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@vm-accountsweb-testing.spline.inf.fu-berlin.de>2024-02-11 19:48:44 +0000
committerroot <root@vm-accountsweb-testing.spline.inf.fu-berlin.de>2024-02-11 19:48:44 +0000
commit60df88b78e139122046a082883c87aaac19be1a1 (patch)
tree6168fd1efe030892292e88df303b159429ece3c6
parent0bceb5c49a9a4834cfcfcdf8dfcb5de859db204b (diff)
downloadweb-60df88b78e139122046a082883c87aaac19be1a1.tar.gz
web-60df88b78e139122046a082883c87aaac19be1a1.tar.bz2
web-60df88b78e139122046a082883c87aaac19be1a1.zip
ldap: Fix catching exceptions
-rw-r--r--accounts/backend/user/ldap.py7
1 files 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