Fix ldap UserID with spec chars breaks ldapsearch

pydio · Sep 22, 2016 · 5c65dbd · 5c65dbd
1 parent 35a2c19
commit 5c65dbd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/src/plugins/auth.ldap/LdapAuthDriver.php b/core/src/plugins/auth.ldap/LdapAuthDriver.php
@@ -988,6 +988,13 @@ public function getLdapGroupListFromDN()
      */
     public function sanitize($s, $level = InputFilter::SANITIZE_HTML)
     {
-        return $s;
+        $preg = '/[\\/<>\?\*\\\\|;:,+"\]\[]/';
+        /**
+         * These are illegal characters and can break ldap searching.
+         * when we create new user on Windows AD, these illegal characters will be replaced by '_'.
+         * Give a try by replacement of '_'
+         */
+        $newS = preg_replace($preg, '_', $s);
+        return $newS;
     }
 }
diff --git a/core/src/plugins/auth.multi/MultiAuthDriver.php b/core/src/plugins/auth.multi/MultiAuthDriver.php
@@ -568,7 +568,7 @@ public function sanitize($s, $level = InputFilter::SANITIZE_HTML)
          * Override only for ldap.
          */
         if ($this->masterSlaveMode) {
-            if ($this->masterName == 'ldap') {
+            if (($this->masterName == 'ldap') || ($this->masterName == 'ldapv2')) {
                 return $this->drivers[$this->masterName]->sanitize($s, $level);
             }
         }