X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=a163ee5b691d9b2cfc4253b30048961aab7dea08;hb=86777849bc73a5f5b32e3e23c11d525ed00c5af5;hp=3f7b5dddb7d3cfdca74ee163b5654dde645fd2c3;hpb=2b18a8ffcae2a4a2ae3a3636e66ae4db51df1df8;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 3f7b5dd..a163ee5 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -37,7 +37,7 @@ class XorgSession extends PlSession } } if ((check_ip('dangerous') && S::has('uid')) || check_account()) { - $_SESSION['log']->log("view_page", $_SERVER['REQUEST_URI']); + S::logger()->log("view_page", $_SERVER['REQUEST_URI']); } return true; } @@ -47,19 +47,19 @@ class XorgSession extends PlSession private function tryCookie() { S::kill('auth_by_cookie'); - if (Cookie::v('ORGaccess') == '' || !Cookie::has('ORGuid')) { + if (Cookie::v('access') == '' || !Cookie::has('uid')) { return -1; } $res = XDB::query('SELECT user_id, password FROM auth_user_md5 WHERE user_id = {?} AND perms IN(\'admin\', \'user\')', - Cookie::i('ORGuid')); + Cookie::i('uid')); if ($res->numRows() != 0) { list($uid, $password) = $res->fetchOneRow(); require_once 'secure_hash.inc.php'; $expected_value = hash_encrypt($password); - if ($expected_value == Cookie::v('ORGaccess')) { + if ($expected_value == Cookie::v('access')) { S::set('auth_by_cookie', $uid); return 0; } else { @@ -79,18 +79,34 @@ 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); - /* TODO: update GApps password here!!! */ + 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) { + if (!S::logged()) { + Platal::page()->trigError('Mot de passe ou nom d\'utilisateur invalide'); + } else { + Platal::page()->trigError('Mot de passe invalide'); + } S::logger($uid)->log('auth_fail', 'bad password'); return null; } @@ -129,11 +145,10 @@ class XorgSession extends PlSession */ if (S::has('suid')) { $suid = S::v('suid'); - $login = $uname = $suid['forlife']; + $login = $uname = $suid['uid']; $redirect = false; } else { $uname = Env::v('username'); - if (Env::v('domain') == "alias") { $res = XDB::query('SELECT redirect FROM virtual @@ -152,17 +167,25 @@ class XorgSession extends PlSession } } - $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && preg_match('/^\d*$/', $uname)) ? 'id' : 'alias'); + $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && is_numeric($uname)) ? 'id' : 'alias'); + if (!is_null($uid) && S::has('suid')) { + $suid = S::v('suid'); + if ($suid['uid'] == $uid) { + $uid = S::i('uid'); + } else { + $uid = null; + } + } if (!is_null($uid)) { S::set('auth', AUTH_MDP); - if (Post::has('domain')) { - if (($domain = Post::v('domain', 'login')) == 'alias') { - setcookie('ORGdomain', "alias", (time() + 25920000), '/', '', 0); - } else { - setcookie('ORGdomain', '', (time() - 3600), '/', '', 0); + if (!S::has('suid')) { + if (Post::has('domain')) { + if (($domain = Post::v('domain', 'login')) == 'alias') { + Cookie::set('domain', 'alias', 300); + } else { + Cookie::kill('domain'); + } } - // pour que la modification soit effective dans le reste de la page - $_COOKIE['ORGdomain'] = $domain; } S::kill('challenge'); S::logger($uid)->log('auth_ok'); @@ -177,37 +200,26 @@ class XorgSession extends PlSession } else if (S::has('uid')) { return true; } - if ($level == -1) { - S::set('auth', AUTH_COOKIE); + if ($level == AUTH_SUID) { + S::set('auth', AUTH_MDP); } - 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, + UNIX_TIMESTAMP(s.start) AS lastlogin, s.host 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') + LEFT JOIN logger.last_sessions AS ls ON (ls.uid = u.user_id) + LEFT JOIN logger.sessions AS s ON(s.id = ls.id) + WHERE u.user_id = {?} AND u.perms IN('admin', 'user')", $uid); $sess = $res->fetchOneAssoc(); $perms = $sess['perms']; unset($sess['perms']); - // Retrieves account usage information (last login, last host). - $res = XDB::query('SELECT UNIX_TIMESTAMP(s.start) AS lastlogin, s.host - FROM logger.sessions AS s - WHERE s.uid = {?} AND s.suid = 0 - ORDER BY s.start DESC - LIMIT 1', $uid); - if ($res->numRows()) { - $sess = array_merge($sess, $res->fetchOneAssoc()); - } - // Loads the data into the real session. $_SESSION = array_merge($_SESSION, $sess); @@ -215,27 +227,21 @@ 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); + $logger->saveLastSession(); + Cookie::set('uid', $uid, 300); 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 && S::i('auth_by_cookie') != $uid) { - $logger->log("cookie_on"); - } + $this->setAccessCookie(false, S::i('auth_by_cookie') != $uid); } else { - setcookie('ORGaccess', '', time() - 3600, '/', '', 0); - if ($logger) { - $logger->log("cookie_off"); - } + $this->killAccessCookie(); } } // Finalizes the session setup. - $this->makePerms($perms); + S::set('perms', User::makePerms($perms)); $this->securityChecks(); $this->setSkin(); $this->updateNbNotifs(); @@ -270,26 +276,14 @@ class XorgSession extends PlSession public function tokenAuth($login, $token) { - // FIXME: we broke the session here because some RSS feeds (mainly wiki feeds) require - // a valid nome and checks the permissions. When the PlUser object will be ready, we'll - // be able to return a simple 'PlUser' object here without trying to alterate the - // session. - $res = XDB::query('SELECT u.user_id AS uid, u.perms, u.nom, u.nom_usage, u.prenom, u.promo, FIND_IN_SET(\'femme\', u.flags) AS sexe + $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) { - $sess = $res->fetchOneAssoc(); - if (!S::has('uid')) { - $_SESSION = $sess; - $this->makePerms($sess['perms']); - return S::i('uid'); - } else if (S::i('uid') == $sess['uid']) { - return S::i('uid'); - } else { - Platal::page()->kill('Invalid state. To be fixed when hruid is ready'); - } + $data = $res->fetchOneAssoc(); + return new User($data['hruid'], $data); } return null; } @@ -310,7 +304,6 @@ class XorgSession extends PlSession public function setSkin() { - global $globals; if (S::logged() && (!S::has('skin') || S::has('suid'))) { $uid = S::v('uid'); $res = XDB::query("SELECT skin_tpl @@ -338,6 +331,29 @@ class XorgSession extends PlSession $n = select_notifs(false, S::i('uid'), S::v('watch_last'), false); S::set('notifs', $n->numRows()); } + + public function setAccessCookie($replace = false, $log = true) { + if (S::has('suid') || ($replace && !Cookie::blank('access'))) { + return; + } + require_once('secure_hash.inc.php'); + Cookie::set('access', hash_encrypt(S::v('password')), 300, true); + if ($log) { + S::logger()->log('cookie_on'); + } + } + + public function killAccessCookie($log = true) { + Cookie::kill('access'); + if ($log) { + S::logger()->log('cookie_off'); + } + } + + public function killLoginFormCookies() { + Cookie::kill('uid'); + Cookie::kill('domain'); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: