0001-test_ldap-use-USERNAME-PASS-instead-of-duplicated-ha.patch

Benjamin Renard, 10 novembre 2022 23:36

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

Subject: [PATCH 1/6] test_ldap: use USERNAME & PASS instead of duplicated
 hard-coded values

Licence: MIT

 tests/test_ldap.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

     pytestmark = pytest.mark.skipif(not has_slapd(), reason='slapd is not installed')
     USERNAME = 'etienne.michu'
     UID = 'etienne.michu'
     UID = USERNAME
     CN = 'Étienne Michu'
     DN = 'cn=%s,o=ôrga' % escape_dn_chars(CN)
     PASS = 'passé'
     UPASS = 'passé'
     PASS = 'Passé1234'
     UPASS = 'Passé1234'
     EMAIL = 'etienne.michu@example.net'
     CARLICENSE = '123445ABC'
     UUID = '8ff2f34a-4a36-103c-8d0a-e3a0333484d3'
-...
+            }
+        ]
         response = client.post(
             '/login/', {'login-password-submit': '1', 'username': 'etienne.michu', 'password': PASS}, follow=True
             '/login/', {'login-password-submit': '1', 'username': USERNAME, 'password': PASS}, follow=True
+        )
         assert Group.objects.count() == 0
         assert response.context['user'].username == '%s@ldap' % USERNAME
-...
                 'use_tls': False,
+            }
+        ]
         user = authenticate(username='etienne.michu', password='passé')
         user = authenticate(username=USERNAME, password=PASS)
         assert user
         assert user.check_password('passé')
         assert user.check_password(PASS)
         user.set_password('àbon')
         assert user.check_password('àbon')
         user2 = authenticate(username='etienne.michu', password='àbon')
         user2 = authenticate(username=USERNAME, password='àbon')
         assert user.pk == user2.pk
         with mock.patch(
             'authentic2.backends.ldap_backend.LDAPBackend.modify_password', side_effect=ldap.UNWILLING_TO_PERFORM
         ):
             with pytest.raises(PasswordChangeError):
                 user.set_password('passé')
                 user.set_password(PASS)
                 assert 'set_password failed (UNWILLING_TO_PERFORM)' in caplog.text
-...
         assert caplog.records[1].message == 'Binding to server %s (anonymously)' % slapd.ldap_url
         assert caplog.records[2].message == (
+            (
                 "Created user etienne.michu@ldap (uuid %s) from dn=cn=Étienne Michu,o=ôrga, uid=['etienne.michu'], "
                 "Created user etienne.michu@ldap (uuid %s) from dn=cn=Étienne Michu,o=ôrga, uid=['%s'], "
                 "sn=['Michu'], givenname=['Étienne'], l=['Paris'], mail=['etienne.michu@example.net'], entryuuid=['%s']"
+            )
             % (User.objects.first().uuid, entryuuid)
             % (User.objects.first().uuid, USERNAME, entryuuid)
+        )
         assert caplog.records[-1].message == 'Search for (|(mail=*)(uid=*)) returned 6 users.'
-...
         User.objects.update(first_name='John')
         management.call_command('sync-ldap-users', verbosity=3)
         assert caplog.records[2].message == (
             "Updated user etienne.michu@ldap (uuid %s) from dn=cn=Étienne Michu,o=ôrga, uid=['etienne.michu'], "
             "Updated user etienne.michu@ldap (uuid %s) from dn=cn=Étienne Michu,o=ôrga, uid=['%s'], "
             "sn=['Michu'], givenname=['Étienne'], l=['Paris'], mail=['etienne.michu@example.net'], entryuuid=['%s']"
         ) % (User.objects.first().uuid, entryuuid)
         ) % (User.objects.first().uuid, USERNAME, entryuuid)
     def test_get_users_select_realm(slapd, settings, db, caplog):
-...
             'givenname': ['Étienne'],
             'mail': ['etienne.michu@example.net'],
             'sn': ['Michu'],
             'uid': ['etienne.michu'],
             'uid': [USERNAME],
             'carlicense': ['123445ABC'],
             'entryuuid': None,
+        }
-...
             'givenname': ['\xc9tienne'],
             'mail': ['etienne.michu@example.net'],
             'sn': ['Michu'],
             'uid': ['etienne.michu'],
             'uid': [USERNAME],
             'carlicense': ['123445ABC'],
             'entryuuid': None,
+        }
-...
             'givenname': ['\xc9tienne'],
             'mail': ['etienne.michu@example.net'],
             'sn': ['Micho'],
             'uid': ['etienne.michu'],
             'uid': [USERNAME],
             'carlicense': ['123445ABC'],
             'entryuuid': None,
+        }
-...
+            }
+        ]
         response = client.post(
             '/login/', {'login-password-submit': '1', 'username': 'etienne.michu', 'password': PASS}, follow=True
             '/login/', {'login-password-submit': '1', 'username': USERNAME, 'password': PASS}, follow=True
+        )
         user = response.context['user']
         fetched_attrs = user.get_attributes(object(), {})
-...
+            {
                 'url': [slapd.ldap_url],
                 'binddn': force_str('cn=%s,o=ôrga' % escape_dn_chars('Étienne Michu')),
                 'bindpw': 'passé',
                 'bindpw': PASS,
                 'basedn': 'o=ôrga',
                 'use_tls': False,
+            }
-...
         assert 'Base ldapsearch command' in ldap_config_text
         assert 'ldapsearch -v -H ldapi://' in ldap_config_text
         assert '-D "cn=Étienne Michu,o=ôrga"' in ldap_config_text
         assert '-w "passé"' in ldap_config_text
         assert f'-w "{PASS}"' in ldap_config_text
         assert '-b "o=ôrga"' in ldap_config_text
         assert '"(|(mail=*)(uid=*))"' in ldap_config_text
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-test_ldap-use-USERNAME-PASS-instead-of-duplicated-ha.patch