Escape "=" in RDN values.

git-svn-id: svn+ssh://open.inoi.fi/open-ldaptor/trunk@194 373aa48d-36e5-0310-bb30-ae74d9883905

Author: tv

ldaptor/protocols/ldap/distinguishedname.py

@@ -1,6 +1,9 @@
 # See rfc2253
 
-escapedChars = r',+"\<>;'
+# Note that RFC 2253 sections 2.4 and 3 disagree whether "=" needs to
+# be quoted. Let's trust the syntax, slapd refuses to accept unescaped
+# "=" in RDN values.
+escapedChars = r',+"\<>;='
 escapedChars_leading = r' #'
 escapedChars_trailing = r' #'
 

ldaptor/test/test_distinguishedname.py

@@ -85,6 +85,15 @@ class LDAPDistinguishedName_Escaping(TestCaseWithKnownValues):
 
 	(r'cn=bar\ ', [[('cn', r'bar ')]]),
 
+	(r'cn=test+owner=uid\=foo\,ou\=depar'
+         +r'tment\,dc\=example\,dc\=com,dc=ex'
+         +r'ample,dc=com', [[('cn', r'test'),
+                             ('owner', r'uid=foo,ou=depart'
+                              +r'ment,dc=example,dc=com'),
+                             ],
+                            [('dc', r'example')],
+                            [('dc', r'com')]]),
+    
 	(r'cn=bar,dc=example,dc=com', [[('cn', 'bar')],
                                        [('dc', 'example')],
                                        [('dc', 'com')]]),
@@ -97,6 +106,25 @@ class LDAPDistinguishedName_Escaping(TestCaseWithKnownValues):
 
 	)
 
+    def testOpenLDAPEqualsEscape(self):
+        """Slapd wants = to be escaped in RDN attributeValues."""
+        got = dn.DistinguishedName(listOfRDNs=[
+            dn.RelativeDistinguishedName(
+            attributeTypesAndValues=[
+            dn.LDAPAttributeTypeAndValue(attributeType='cn', value=r'test'),
+            dn.LDAPAttributeTypeAndValue(attributeType='owner', value=r'uid=foo,ou=depart'
+                                         +r'ment,dc=example,dc=com'),
+                                     ]),
+
+            dn.RelativeDistinguishedName('dc=example'),
+            dn.RelativeDistinguishedName('dc=com'),
+            ])
+        got = str(got)
+        self.assertEquals(got,
+                          r'cn=test+owner=uid\=foo\,ou\=depar'
+                          +r'tment\,dc\=example\,dc\=com,dc=ex'
+                          +r'ample,dc=com')
+
 class LDAPDistinguishedName_RFC2253_Examples(TestCaseWithKnownValues):
     knownValues = (