CAS-1055

fixed encoding
cyrille-leclerc · Oct 9, 2011 · e12da0e · e12da0e
1 parent ec86532
commit e12da0e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/...in/java/org/jasig/cas/util/LdapUtils.java → ...in/java/org/jasig/cas/util/LdapUtils.java b/...in/java/org/jasig/cas/util/LdapUtils.java → ...in/java/org/jasig/cas/util/LdapUtils.java
@@ -14,6 +14,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.ldap.core.LdapEncoder;
 
 /**
  * Utilities related to LDAP functions.
@@ -44,7 +45,7 @@ public static String getFilterWithValues(final String filter,
         final String[] userDomain;
         String newFilter = filter;
 
-        properties.put("%u", userName.replace("\\", "\\\\"));
+        properties.put("%u", userName);
 
         userDomain = userName.split("@");
 
@@ -62,7 +63,7 @@ public static String getFilterWithValues(final String filter,
         }
 
         for (final String key : properties.keySet()) {
-            final String value = properties.get(key);
+            final String value = LdapEncoder.nameEncode(properties.get(key));
             newFilter = newFilter.replaceAll(key, Matcher.quoteReplacement(value));
         }
 

diff --git a/cas-server-support-ldap/src/test/java/org/jasig/cas/util/LdapUtilTests.java b/cas-server-support-ldap/src/test/java/org/jasig/cas/util/LdapUtilTests.java
@@ -0,0 +1,16 @@
+package org.jasig.cas.util;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Daniel Frett
+ * @version $Revision$ $Date$
+ * @since 3.4.11
+ */
+public final class LdapUtilTests extends TestCase {
+
+     public void testEncoding() {
+        final String filter = "cn=%u";
+        assertEquals("cn=test\\+user@example.com", LdapUtils.getFilterWithValues(filter, "test+user@example.com"));
+    }
+}