X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=534ed861a54c82496cabb476516ad32dcaa31fac;hb=904a82deab29093fa466256194db8527450efd27;hp=1424389793f721d984fb174a0df043a15cf2d051;hpb=6672b29bdfad107ad3b621fce9f27bd6b8542a7f;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 1424389..534ed86 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -24,14 +24,10 @@ class XorgSession extends PlSession public function __construct() { parent::__construct(); - S::bootstrap('perms_backup', new PlFlagSet()); } public function startAvailableAuth() { - if (!(S::v('perms') instanceof PlFlagSet)) { - S::set('perms', S::v('perms_backup')); - } if (!S::logged()) { $cookie = $this->tryCookie(); if ($cookie == 0) { @@ -83,14 +79,26 @@ class XorgSession extends PlSession if (list($uid, $password) = $res->fetchOneRow()) { require_once 'secure_hash.inc.php'; $expected_response = hash_encrypt("$uname:$password:" . S::v('challenge')); - if ($response != $expected_response) { + if ($response != $expected_response && Env::has('xorpass') + && !preg_match('/^0*$/', Env::v('xorpass'))) { $new_password = hash_xor(Env::v('xorpass'), $password); $expected_response = hash_encrypt("$uname:$new_password:" . S::v('challenge')); if ($response == $expected_response) { - XDB::execute('UPDATE auth_user_md5 - SET password = {?} - WHERE user_id = {?}', - $new_password, $uid); + XDB::execute('UPDATE auth_user_md5 + SET password = {?} + WHERE user_id = {?}', + $new_password, $uid); + + // Update the GoogleApps password as well, if required. + global $globals; + if ($globals->mailstorage->googleapps_domain) { + require_once 'googleapps.inc.php'; + $user = User::getSilent($uid); + $account = new GoogleAppsAccount($user); + if ($account->active() && $account->sync_password) { + $account->set_password($new_password); + } + } } } if ($response != $expected_response) { @@ -132,7 +140,7 @@ class XorgSession extends PlSession */ if (S::has('suid')) { $suid = S::v('suid'); - $login = $uname = $suid['forlife']; + $login = $uname = $suid['hruid']; $redirect = false; } else { $uname = Env::v('username'); @@ -186,17 +194,14 @@ class XorgSession extends PlSession unset($_SESSION['log']); // Retrieves main user properties. - $res = XDB::query('SELECT u.user_id AS uid, prenom, prenom_ini, nom, nom_ini, nom_usage, perms, promo, promo_sortie, - matricule, password, FIND_IN_SET(\'femme\', u.flags) AS femme, - a.alias AS forlife, a2.alias AS bestalias, + $res = XDB::query("SELECT u.user_id AS uid, u.hruid, prenom, prenom_ini, nom, nom_ini, nom_usage, perms, promo, promo_sortie, + matricule, password, FIND_IN_SET('femme', u.flags) AS femme, q.core_mail_fmt AS mail_fmt, UNIX_TIMESTAMP(q.banana_last) AS banana_last, q.watch_last, q.core_rss_hash, - FIND_IN_SET(\'watch\', u.flags) AS watch_account, q.last_version, g.g_account_name IS NOT NULL AS googleapps + FIND_IN_SET('watch', u.flags) AS watch_account, q.last_version, g.g_account_name IS NOT NULL AS googleapps FROM auth_user_md5 AS u INNER JOIN auth_user_quick AS q USING(user_id) - INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type = \'a_vie\') - INNER JOIN aliases AS a2 ON (u.user_id = a2.id AND FIND_IN_SET(\'bestalias\', a2.flags)) - LEFT JOIN gapps_accounts AS g ON (u.user_id = g.l_userid AND g.g_status = \'active\') - WHERE u.user_id = {?} AND u.perms IN(\'admin\', \'user\')', $uid); + LEFT JOIN gapps_accounts AS g ON (u.user_id = g.l_userid AND g.g_status = 'active') + WHERE u.user_id = {?} AND u.perms IN('admin', 'user')", $uid); $sess = $res->fetchOneAssoc(); $perms = $sess['perms']; unset($sess['perms']); @@ -218,14 +223,15 @@ class XorgSession extends PlSession if (S::has('suid')) { $suid = S::v('suid'); $logger = S::logger($uid); - $logger->log("suid_start", S::v('forlife') . " by " . $suid['uid']); + $logger->log("suid_start", S::v('hruid') . " by " . $suid['hruid']); } else { $logger = S::logger($uid); setcookie('ORGuid', $uid, (time() + 25920000), '/', '', 0); - if (Post::v('remember', 'false') == 'true') { + + if (S::i('auth_by_cookie') == $uid || Post::v('remember', 'false') == 'true') { $cookie = hash_encrypt($sess['password']); setcookie('ORGaccess', $cookie, (time() + 25920000), '/', '', 0); - if ($logger) { + if ($logger && S::i('auth_by_cookie') != $uid) { $logger->log("cookie_on"); } } else { @@ -237,11 +243,14 @@ class XorgSession extends PlSession } // Finalizes the session setup. - $this->makePerms($perms); + S::set('perms', User::makePerms($perms)); $this->securityChecks(); $this->setSkin(); $this->updateNbNotifs(); check_redirect(); + + // We should not have to use this private data anymore + S::kill('auth_by_cookie'); return true; } @@ -267,12 +276,25 @@ class XorgSession extends PlSession } } + public function tokenAuth($login, $token) + { + $res = XDB::query('SELECT u.hruid + FROM aliases AS a + INNER JOIN auth_user_md5 AS u ON (a.id = u.user_id AND u.perms IN ("admin", "user")) + INNER JOIN auth_user_quick AS q ON (a.id = q.user_id AND q.core_rss_hash = {?}) + WHERE a.alias = {?} AND a.type != "homonyme"', $token, $login); + if ($res->numRows() == 1) { + $data = $res->fetchOneAssoc(); + return new User($data['hruid'], $data); + } + return null; + } + public function makePerms($perm) { $flags = new PlFlagSet(); if ($perm == 'disabled' || $perm == 'ext') { S::set('perms', $flags); - S::set('perms_backup', $flags); return; } $flags->addFlag(PERMS_USER); @@ -280,12 +302,10 @@ class XorgSession extends PlSession $flags->addFlag(PERMS_ADMIN); } S::set('perms', $flags); - S::set('perms_backup', $flags); } public function setSkin() { - global $globals; if (S::logged() && (!S::has('skin') || S::has('suid'))) { $uid = S::v('uid'); $res = XDB::query("SELECT skin_tpl @@ -296,6 +316,11 @@ class XorgSession extends PlSession } } + public function loggedLevel() + { + return AUTH_COOKIE; + } + public function sureLevel() { return AUTH_MDP;