Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-05 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [MOD] Add dot to LDAP group name chack regex. Thanks to @davidpsc. Closes #280

Browse Source 
* [FIX] Fixed user migration from 1.1
* [MOD] Update version
This commit is contained in:
nuxsmin
2016-09-24 01:11:43 +02:00
committed by Rubén Domínguez
parent 758d35975a
commit 08d290bba1
5 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@@ -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

6
CHANGELOG-ES
View File

@@ -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

2
inc/Auth.class.php
View File

@@ -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;

6
inc/UserMigrate.class.php
View File

@@ -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;

2
inc/Util.class.php
View File

@@ -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);