From 08d290bba158198ab0704efc515300d82fa08d74 Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Sat, 24 Sep 2016 01:11:43 +0200
Subject: [PATCH] * [MOD] Add dot to LDAP group name chack regex. Thanks to
 @davidpsc. Closes #280 * [FIX] Fixed user migration from 1.1 * [MOD] Update
 version

---
 CHANGELOG                 | 6 ++++++
 CHANGELOG-ES              | 6 ++++++
 inc/Auth.class.php        | 2 +-
 inc/UserMigrate.class.php | 6 +++++-
 inc/Util.class.php        | 2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f9b18030..afcc2968 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+=== ** v1.2.0.16 ===
+
+* [MOD] Add dot to LDAP group name chack regex. Thanks to @davidpsc. Closes #280
+* [FIX] Fixed user migration from 1.1
+* [MOD] Update version
+
 === ** v1.2.0.15 ===
 
 * [FIX] Fixed LDAP mail retrieving when multiple mail addresses are set. Thanks to @ArminXG. Closes #278
diff --git a/CHANGELOG-ES b/CHANGELOG-ES
index 0337db2f..91000e96 100644
--- a/CHANGELOG-ES
+++ b/CHANGELOG-ES
@@ -1,3 +1,9 @@
+=== ** v1.2.0.16 ===
+
+* [MOD] Añadido punto a la expresión regular en la comprobación del nombre de grupo en LDAP. Gracias a @davidpsc. Closes #280
+* [FIX] Corregida migración de usuario desde 1.1
+* [MOD] Actualizada versión
+
 === ** 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
diff --git a/inc/Auth.class.php b/inc/Auth.class.php
index 03224a1d..2e012bf1 100644
--- a/inc/Auth.class.php
+++ b/inc/Auth.class.php
@@ -137,7 +137,7 @@ class Auth
         $ldapGroup = strtolower(Config::getValue('ldap_group'));
         $groupName = array();
 
-        preg_match('/^cn=([\w\s-]+),.*/i', $group, $groupName);
+        preg_match('/^cn=([\w\s-.]+),.*/i', $group, $groupName);
 
         if (strtolower($groupName[1]) == $ldapGroup || strtolower($group) == $ldapGroup) {
             return true;
diff --git a/inc/UserMigrate.class.php b/inc/UserMigrate.class.php
index a59ed81e..1e90cbe1 100644
--- a/inc/UserMigrate.class.php
+++ b/inc/UserMigrate.class.php
@@ -71,11 +71,15 @@ class UserMigrate
             . 'user_lastUpdate = NOW(),'
             . 'user_isMigrate = 0 '
             . 'WHERE user_login = :login '
-            . 'AND user_isMigrate = 1 LIMIT 1';
+            . 'AND user_isMigrate = 1 '
+            . 'AND (user_pass = SHA1(CONCAT(user_hashSalt,:passOld)) '
+            . 'OR user_pass = MD5(:passOldMd5)) 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
index 90a7efb1..217b8d98 100644
--- a/inc/Util.class.php
+++ b/inc/Util.class.php
@@ -309,7 +309,7 @@ class Util
      */
     public static function getVersion($retBuild = false)
     {
-        $version = array(1, 2, 0, '15');
+        $version = array(1, 2, 0, '16');
 
         if (!$retBuild) {
             array_pop($version);