* [FIX] Fixed LDAP mail retrieving when multiple mail addresses are s…

…et. Thanks to @ArminXG. Closes #278 * [FIX] Fixed user migration process. * [MOD] Add LDAP mail mapping. Related #278 * [MOD] Update version
nuxsmin · Sep 21, 2016 · 7189538 · 7189538
1 parent e32c45d
commit 7189538
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,12 @@
+=== ** v1.2.0.15 ===
+
+* [FIX] Fixed LDAP mail retrieving when multiple mail addresses are set. Thanks to @ArminXG. Closes #278
+* [MOD] Add LDAP mail mapping. Related #278
+* [FIX] Fixed user migration process.
+* [FIX] Fixed resetting search filters.
+* [FIX] Fixed basic auth check. Thanks to @davidpsc . Closes #275
+* [FIX] Fixed LDAP user search filter when ADS is not set. Solves #277
+
 === ** v1.2.0.14 ===
 
 * [FIX] Fixed issue when installing sysPass. Solves #272

diff --git a/CHANGELOG-ES b/CHANGELOG-ES
@@ -1,3 +1,12 @@
+=== ** v1.2.0.15 ===
+
+* [FIX] Corregido fallo al obtener dirección de correo desde LDAP cuando hay múltiples direcciones. Gracias a @ArminXG. Closes #278
+* [MOD] Añadido mapeo de correo en LDAP. Related #278
+* [FIX] Corregido proceso de migración de usuarios.
+* [FIX] Corregido reset de filtros de búsqueda.
+* [FIX] Corregida comprobación de basic auth. Gracias a @davidpsc . Closes #275
+* [FIX] Corregido filtro de búsqueda en LDAP para directorios no ADS. Solves #277
+
 === ** v1.2.0.14 ===
 
 * [FIX] Corregido error en la instalación de sysPass. Solves #272

diff --git a/inc/Ldap.class.php b/inc/Ldap.class.php
@@ -55,6 +55,7 @@ class Ldap
         'givenname' => 'givenname',
         'sn' => 'sn',
         'mail' => 'mail',
+        'mailPrimaryAddress' => 'mail',
         'lockoutTime' => 'expire');
 
     /**
@@ -374,7 +375,7 @@ public static function getLDAPAttr()
                         if (array_key_exists($entryAttr, $attribs)) {
                             if ($attrValue['count'] > 1) {
                                 // Almacenamos un array de valores
-                                $res[$attribs[$entryAttr]] = $attrValue;
+                                $res[$attribs[$entryAttr]] = implode(',', $attrValue);
                             } else {
                                 // Almacenamos  1 solo valor
                                 $res[$attribs[$entryAttr]] = $attrValue[0];

diff --git a/inc/UserMigrate.class.php b/inc/UserMigrate.class.php
@@ -71,15 +71,11 @@ public static function migrateUser($userLogin, $userPass)
             . 'user_lastUpdate = NOW(),'
             . 'user_isMigrate = 0 '
             . 'WHERE user_login = :login '
-            . 'AND user_isMigrate = 1 '
-            . 'AND (user_pass = SHA1(CONCAT(user_hashSalt,:passOld)) '
-            . 'OR user_pass = MD5(:passOldMd5)) LIMIT 1';
+            . 'AND user_isMigrate = 1 LIMIT 1';
 
         $data['pass'] = $passdata['pass'];
         $data['salt'] = $passdata['salt'];
         $data['login'] = $userLogin;
-        $data['passOld'] = $userPass;
-        $data['passOldMd5'] = $userPass;
 
         if (DB::getQuery($query, __FUNCTION__, $data) === false) {
             return false;

diff --git a/inc/Util.class.php b/inc/Util.class.php
@@ -309,7 +309,7 @@ public static function curlIsAvailable()
      */
     public static function getVersion($retBuild = false)
     {
-        $version = array(1, 2, 0, '14');
+        $version = array(1, 2, 0, '15');
 
         if (!$retBuild) {
             array_pop($version);