0001-ldap-allow-passing-realm-to-sync-ldap-users-command-.patch

Valentin Deniaud, 23 septembre 2021 15:46

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

Subject: [PATCH] ldap: allow passing realm to sync-ldap-users command (#57038)

 src/authentic2/backends/ldap_backend.py       |  5 +++-
 .../management/commands/sync-ldap-users.py    |  5 +++-
 tests/test_ldap.py                            | 25 +++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

                 yield from cls.normalize_ldap_results(data)
         @classmethod
         def get_users(cls):
         def get_users(cls, realm=None):
             blocks = cls.get_config()
             if not blocks:
                 log.info('No LDAP server configured.')
                 return
             for block in blocks:
                 if realm and realm != block['realm']:
                     continue
                 log.info('Synchronising users from realm "%s"', block['realm'])
                 conn = cls.get_connection(block)
                 if conn is None:

     class Command(BaseCommand):
         def add_arguments(self, parser):
             parser.add_argument('--realm', help='Limit sync to this realm')
         def handle(self, *args, **kwargs):
             root_logger = logging.getLogger()
             ldap_logger = logging.getLogger('authentic2.backends.ldap_backend')
-...
             elif verbosity == 3:
                 ldap_logger.setLevel(logging.DEBUG)
             for user in LDAPBackend.get_users():
             for user in LDAPBackend.get_users(realm=kwargs['realm']):
                 continue

         assert len(caplog.records) == 42
     def test_get_users_select_realm(slapd, settings, db, caplog):
         settings.LDAP_AUTH_SETTINGS = [
+            {
                 'url': [slapd.ldap_url],
                 'realm': 'first',
                 'basedn': 'o=ôrga',
                 'use_tls': False,
             },
+            {
                 'url': [slapd.ldap_url],
                 'realm': 'second',
                 'basedn': 'o=ôrga',
                 'use_tls': False,
             },
+        ]
         management.call_command('sync-ldap-users', verbosity=2)
         assert 'Synchronising users from realm "first"' in caplog.messages
         assert 'Synchronising users from realm "second"' in caplog.messages
         caplog.clear()
         management.call_command('sync-ldap-users', verbosity=2, realm='second')
         assert 'Synchronising users from realm "first"' not in caplog.messages
         assert 'Synchronising users from realm "second"' in caplog.messages
     def test_alert_on_wrong_user_filter(slapd, settings, client, db, caplog):
         settings.LDAP_AUTH_SETTINGS = [
+            {
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-ldap-allow-passing-realm-to-sync-ldap-users-command-.patch