- return self.get_user_data_from_conn(conn, dn)
- except Exception, e: # pylint: disable=broad-except
- self.error(e)
+ except ValueError as e:
+ self.error(
+ 'DN generation failed with template %s, user %s: %s'
+ % (self.user_dn_tmpl, user, e)
+ )
+ return {}
+ except Exception as e: # pylint: disable=broad-except
+ self.error(
+ 'Unhandled error generating DN from %s, user %s: %s'
+ % (self.user_dn_tmpl, user, e)
+ )
+ return {}
+
+ try:
+ conn = self._ldap_bind()
+ base = self.base_dn
+ return self.get_user_data_from_conn(conn, dn, base, user)
+ except ldap.LDAPError as e:
+ self.error(
+ 'LDAP search failed for DN %s on base %s: %s' %
+ (dn, base, e)
+ )
+ return {}
+ except Exception as e: # pylint: disable=broad-except
+ self.error(
+ 'Unhandled LDAP error for DN %s on base %s: %s' %
+ (dn, base, e)
+ )