feat(ldap.dn): add ldap.dn.normalize()

spaceone · spaceone · commit 7c80d5c34161 · 2025-06-04T08:25:25.000+02:00
diff --git a/Lib/ldap/dn.py b/Lib/ldap/dn.py
@@ -122,3 +122,8 @@ def is_dn(s,flags=0):
     return False
   else:
     return True
+
+
+def normalize(s, flags=0):
+  """Returns a normalized distinguished name (DN)"""
+  return dn2str(str2dn(s, flags), flags)
diff --git a/Tests/t_ldap_dn.py b/Tests/t_ldap_dn.py
@@ -222,7 +222,6 @@ def test_dn2str(self):
             ], ldap.DN_FORMAT_DCE),
             '/dc=com/dc=example/ou=Testing/uid=test42,cn=test42'
         )
-
         self.assertEqual(
             ldap.dn.dn2str([
                 [('cn', 'äöüÄÖÜß', ldap.AVA_BINARY)],
@@ -378,6 +377,35 @@ def test_explode_rdn(self):
             ['cn=äöüÄÖÜß']
         )
 
+    def test_normalize(self):
+        """
+        test function normalize()
+        """
+        self.assertEqual(
+            ldap.dn.normalize('uid = test42 , ou = Testing , dc = example , dc = com', flags=ldap.DN_FORMAT_LDAPV3),
+            'uid=test42,ou=Testing,dc=example,dc=com'
+        )
+        self.assertEqual(
+            ldap.dn.normalize('cn=äöüÄÖÜß,dc=example,dc=com', flags=0),
+            'cn=äöüÄÖÜß,dc=example,dc=com'
+        )
+        self.assertEqual(
+            ldap.dn.normalize('cn=#C3A4C3B6C3BCC384C396C39CC39F,dc=example,dc=com', flags=0),
+            'cn=äöüÄÖÜß,dc=example,dc=com'
+        )
+        self.assertEqual(
+            ldap.dn.normalize('cn=#C3A4C3B6C3BCC384C396C39CC39F,dc=example,dc=com', flags=ldap.DN_FORMAT_LDAPV3),
+            'cn=#C3A4C3B6C3BCC384C396C39CC39F,dc=example,dc=com'
+        )
+        self.assertEqual(
+            ldap.dn.normalize('cn=äöüÄÖÜß,dc=example,dc=com', flags=ldap.DN_FORMAT_LDAPV3),
+            r'cn=\C3\A4\C3\B6\C3\BC\C3\84\C3\96\C3\9C\C3\9F,dc=example,dc=com'
+        )
+        self.assertEqual(
+            ldap.dn.normalize('/ dc = com / dc = example / ou = Testing / uid = test42 , cn = test42', flags=ldap.DN_FORMAT_DCE),
+            '/dc=com/dc=example/ou=Testing/uid=test42,cn=test42'
+        )
+
 
 if __name__ == '__main__':
     unittest.main()
