Projet

Général

Profil

0002-ldap-do-not-continue-on-timeout-61128.patch

Benjamin Dauvergne, 27 janvier 2022 16:00

Télécharger (1,39 ko)

Voir les différences:

Subject: [PATCH 2/3] ldap: do not continue on timeout (#61128)

 src/authentic2/backends/ldap_backend.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
src/authentic2/backends/ldap_backend.py
913 913
                results = self.normalize_ldap_results(results)
914 914
            except ldap.NO_SUCH_OBJECT:
915 915
                pass
916
            except ldap.TIMEOUT:
917
                log.error('[%s] connection timed out while retrieving group DNs', ldap_uri)
918 916
            else:
919 917
                group_dns.update(dn for dn, attrs in results)
920 918
        return group_dns
......
1499 1497
        for block in blocks:
1500 1498
            if realm and realm != block['realm']:
1501 1499
                continue
1502
            yield from cls.get_users_for_block(block)
1500
            try:
1501
                yield from cls.get_users_for_block(block)
1502
            except ldap.LDAPError as e:
1503
                log.error('synchronization failed on an LDAP error: "%s"', e)
1503 1504

  
1504 1505
    @classmethod
1505 1506
    def deactivate_orphaned_users(cls):
1506
-