0001-ldap-support-trailing-slash-on-tls-errors-58149.patch

Valentin Deniaud, 26 octobre 2021 17:51

Voir les différences: en ligne côte à côte

Subject: [PATCH] ldap: support trailing slash on tls errors (#58149)

 src/authentic2/backends/ldap_backend.py | 10 +++-------
 tests/test_ldap.py                      |  5 +++--
 2 files changed, 6 insertions(+), 9 deletions(-)

                 return False, 'timeout'
             except ldap.SERVER_DOWN:
                 if block['use_tls']:
                     url = block['url']
                     if url and isinstance(url, (list, tuple)):
                         url = url[0]
                     hostname = url.split('://')[-1]
                     port = 636
                     if ':' in hostname:
                         hostname, port = hostname.split(':')
                     url = urllib.parse.urlparse(ldap_uri)
                     hostname = url.hostname
                     port = url.port or 636
                     context = ssl.create_default_context()
                     try:
                         with socket.create_connection((hostname, port), timeout=2) as sock:

         assert force_bytes('name="username"') not in result.content
     def test_tls_connect_on_ldap_errors(db, tls_slapd, settings, client, caplog):
     @pytest.mark.parametrize('trailing_slash', ('', '/'))
     def test_tls_connect_on_ldap_errors(db, tls_slapd, settings, client, caplog, trailing_slash):
         conn = tls_slapd.get_connection_admin()
         conn.modify_s(
             'cn=config',
-...
         settings.LDAP_AUTH_SETTINGS = [
+            {
                 'url': [tls_slapd.ldap_url],
                 'url': [tls_slapd.ldap_url + trailing_slash],
                 'basedn': 'o=ôrga',
                 'use_tls': True,
                 'cacertfile': cert_file,
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-ldap-support-trailing-slash-on-tls-errors-58149.patch