0004-ldap-rename-process_controls-method-to-process_bind_.patch

Benjamin Renard, 10 novembre 2022 23:36

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

Subject: [PATCH 4/6] ldap: rename process_controls method to
 process_bind_controls

Licence: MIT

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

             return blocks
         @classmethod
         def process_controls(cls, request, block, conn, authz_id, ctrls):
         def process_bind_controls(cls, request, block, conn, authz_id, ctrls):
             attributes = cls.get_ppolicy_attributes(block, conn, authz_id)
             for c in ctrls:
                 if c.controlType == ppolicy.PasswordPolicyControl.controlType:
-...
                                 else:
                                     serverctrls = []
                                 results = conn.simple_bind_s(authz_id, password, serverctrls=serverctrls)
                                 self.process_controls(request, block, conn, authz_id, results[3])
                                 self.process_bind_controls(request, block, conn, authz_id, results[3])
                                 user_login_success(authz_id)
                                 if not block['connect_with_user_credentials']:
                                     try:
-...
                                 break
                             except ldap.INVALID_CREDENTIALS as e:
                                 if block.get('use_controls') and len(e.args) > 0 and 'ctrls' in e.args[0]:
                                     self.process_controls(
                                     self.process_bind_controls(
                                         request, block, conn, authz_id, DecodeControlTuples(e.args[0]['ctrls'])
+                                    )
                                 success, error = self.bind(block, conn)

             '/login/', {'login-password-submit': '1', 'username': USERNAME, 'password': PASS}, follow=True
+        )
         def patched_process_controls(cls, request, block, conn, authz_id, ctrls):
         def patched_process_bind_controls(cls, request, block, conn, authz_id, ctrls):
             raise exception[0]('oops')
         monkeypatch.setattr(
             ldap_backend.LDAPBackend,
             'process_controls',
             patched_process_controls,
             'process_bind_controls',
             patched_process_bind_controls,
+        )
         client.post(
             '/login/', {'login-password-submit': '1', 'username': USERNAME, 'password': PASS}, follow=True
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0004-ldap-rename-process_controls-method-to-process_bind_.patch