Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[ldap] fix exception handling on authentication error stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 02 Jul 2010 09:09:59 +0200
branchstable
changeset 5856 a02129508378
parent 5855 db59080f1c8d
child 5857 1a24c62aefc5
[ldap] fix exception handling on authentication error
server/sources/ldapuser.py file | annotate | diff | comparison | revisions 
--- a/server/sources/ldapuser.py	Fri Jul 02 09:05:56 2010 +0200
+++ b/server/sources/ldapuser.py	Fri Jul 02 09:09:59 2010 +0200
@@ -19,8 +19,6 @@
 
 this source is for now limited to a read-only CWUser source
 
-
-
 Part of the code is coming form Zope's LDAPUserFolder
 
 Copyright (c) 2004 Jens Vagelpohl.
@@ -297,10 +295,12 @@
         # check password by establishing a (unused) connection
         try:
             self._connect(user, password)
+        except ldap.LDAPError, ex:
+            # Something went wrong, most likely bad credentials
+            self.info('while trying to authenticate %s: %s', user, ex)
+            raise AuthenticationError()
         except Exception:
-            self.error('while trying to authenticate %s: %s', user,
-                       exc_info=True)
-            # Something went wrong, most likely bad credentials
+            self.error('while trying to authenticate %s', user, exc_info=True)
             raise AuthenticationError()
         return self.extid2eid(user['dn'], 'CWUser', session)
cubicweb