0002-ldap-display-server-error-on-technical-info-backoffi.patch

Paul Marillonnet, 27 juin 2022 15:55

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

Subject: [PATCH 2/2] ldap: display server error on technical info backoffice
 page (#65491)

 .../templates/authentic2/manager/ldap_details.html        | 7 +++++--
 src/authentic2/manager/views.py                           | 8 +++++---
 tests/test_ldap.py                                        | 6 +++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

     {% load i18n %}
     <h4>{% trans "Realm:" %} {{ ldap.realm }}</h4>
     <div class="a2-manager-ldap-{{ ldap.realm }}">
     {% if not error %}
     {% if not ldap.error %}
     <h5>{% blocktrans %}Base ldapsearch command:{% endblocktrans %}</h5>
      <pre>ldapsearch -v -H {{ ldap.ldap_uri }} -D "{{ ldap.binddn }}" -w "{{ ldap.bindpw }}" -b "{{ ldap.basedn }}"{% if ldap.user_filter or ldap.sync_ldap_users_filter %} "{% firstof ldap.sync_ldap_users_filter ldap.user_filter %}"{% endif %}</pre>
     {% else %}
     <div class="error">
     {% blocktrans %}Error while attempting to connect to LDAP server, base ldapsearch command won't be displayed.{% endblocktrans %}
     <p>{% blocktrans %}Error while attempting to connect to LDAP server, base ldapsearch command won't be displayed.{% endblocktrans %}</p>
     {% if ldap.errmsg %}
     <p>{% blocktrans %}Server error: {{ errmsg }}{% endblocktrans %}</p>
     {% endif %}
     </div>
     {% endif %}
     <h5>{% trans "Configuration:" %}</h5>

             kwargs['ldap_list'] = []
             for block in backend.get_config():
                 config = block.copy()
                 conn = backend.get_connection(config)
                 if not conn:
                     kwargs['error'] = True
                 try:
                     conn = backend.get_connection(config, raises=True)
                 except ldap.LDAPError as e:
                     config['error'] = True
                     config['errmsg'] = str(e)
                 else:
                     # retrieve ldap uri, not directly visible in configuration block
                     config['ldap_uri'] = conn.get_option(ldap.OPT_URI)

         ]:
             assert opt in ldap_config_text
         def buggy_get_connection(config, raises=False):
             raise ldap.LDAPError('some buggy connection error message')
         # mock a buggy connection
         monkeypatch.setattr(ldap_backend.LDAPBackend, 'get_connection', lambda x: None)
         monkeypatch.setattr(ldap_backend.LDAPBackend, 'get_connection', buggy_get_connection)
         resp = app.get(reverse('a2-manager-tech-info'))
         ldap_config_text = resp.pyquery('div#a2-manager-tech-info-ldap-list').text()
         assert 'Base ldapsearch command' not in ldap_config_text
         assert 'Error while attempting to connect to LDAP server' in ldap_config_text
         assert 'some buggy connection error message' in ldap_config_text
     class TestLookup:
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0002-ldap-display-server-error-on-technical-info-backoffi.patch