From 96d636b4e96621ad48244ea8b970ad870ccfc77b Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 24 Feb 2021 14:42:29 +0100 Subject: [PATCH] ldap: differentiate errors during bind (#51353) --- src/authentic2/backends/ldap_backend.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/authentic2/backends/ldap_backend.py b/src/authentic2/backends/ldap_backend.py index 28f212e3..3c8de894 100644 --- a/src/authentic2/backends/ldap_backend.py +++ b/src/authentic2/backends/ldap_backend.py @@ -1449,8 +1449,12 @@ class LDAPBackend(object): return False, u'invalid credentials' except ldap.INVALID_DN_SYNTAX: return False, u'invalid dn syntax %s' % who - except (ldap.TIMEOUT, ldap.CONNECT_ERROR, ldap.SERVER_DOWN): - return False, u'ldap is down' + except ldap.CONNECT_ERROR: + return False, 'connection error' + except ldap.TIMEOUT: + False, 'timeout' + except ldap.SERVER_DOWN: + False, 'ldap is down' @classmethod def get_connection(cls, block, credentials=()): -- 2.20.1