X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=ccae18faf40cb92fec8b001edd7c06a7319a78aa;hb=0c02607ec8d2a6aebac70a050c8f6b3a58ff566e;hp=e0f89ee2e150240431e3816c38df3ca97efa0a72;hpb=de14933c384281bfc5571b8b3d7d7ac94b04bc48;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index e0f89ee..ccae18f 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,18 @@ 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')); + $res = XDB::query('SELECT uid, password + FROM accounts + WHERE uid = {?} AND state = \'active\'', + 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')) { + $expected_value = sha1($password); + if ($expected_value == Cookie::v('access')) { S::set('auth_by_cookie', $uid); return 0; } else { @@ -71,25 +70,20 @@ class XorgSession extends PlSession private function checkPassword($uname, $login, $response, $login_type) { - $res = XDB::query('SELECT u.user_id, u.password - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (a.id = u.user_id AND type != \'homonyme\') - WHERE a.' . $login_type . ' = {?} AND u.perms IN(\'admin\', \'user\')', + $res = XDB::query('SELECT a.uid, a.password + FROM accounts AS a + INNER JOIN aliases AS l ON (l.id = a.uid AND l.type != \'homonyme\') + WHERE l.' . $login_type . ' = {?} AND a.state = \'active\'', $login); if (list($uid, $password) = $res->fetchOneRow()) { - require_once 'secure_hash.inc.php'; - $expected_response = hash_encrypt("$uname:$password:" . S::v('challenge')); + $expected_response = sha1("$uname:$password:" . S::v('challenge')); + /* XXX: Deprecates len(password) > 10 conversion */ if ($response != $expected_response) { - $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); + if (!S::logged()) { + Platal::page()->trigError('Mot de passe ou nom d\'utilisateur invalide'); + } else { + Platal::page()->trigError('Mot de passe invalide'); } - } - if ($response != $expected_response) { S::logger($uid)->log('auth_fail', 'bad password'); return null; } @@ -126,13 +120,11 @@ class XorgSession extends PlSession /** We come from an authentication form. */ - if (S::has('suid')) { - $suid = S::v('suid'); - $login = $uname = $suid['hruid']; + if (S::suid()) { + $login = $uname = S::suid('uid'); $redirect = false; } else { $uname = Env::v('username'); - if (Env::v('domain') == "alias") { $res = XDB::query('SELECT redirect FROM virtual @@ -151,92 +143,91 @@ 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::suid()) { + if (S::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::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'); } - return $uid; + return User::getSilentWithValues(null, array('user_id' => $uid)); } - protected function startSessionAs($uid, $level) + protected function startSessionAs($user, $level) { - if ((!is_null(S::v('user')) && S::i('user') != $uid) || (S::has('uid') && S::i('uid') != $uid)) { + if (!($user instanceof User)) { + $user = User::getSilent($user); + if ($user === false) { + return false; + } + } + if ((!is_null(S::v('user')) && S::i('user') != $user->id()) + || (S::has('uid') && S::i('uid') != $user->id())) { return false; } 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. - global $globals; - $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, - CONCAT(a.alias, '@{$globals->mail->domain}') AS forlife, - CONCAT(a2.alias, '@{$globals->mail->domain}') AS bestalias, - 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 - 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); + /** TODO: Move needed informations to account tables */ + /** TODO: Currently suppressed data are matricule, promo */ + /** TODO: Data to move are: banana_last, watch_last, last_version */ + /** TODO: Use the User object to fetch all this */ + $res = XDB::query("SELECT a.uid, a.hruid, a.display_name, a.full_name, a.password, + a.sex = 'female' AS femme, a.email_format as mail_fmt, + a.token, FIND_IN_SET('watch', a.flags) AS watch_account, + UNIX_TIMESTAMP(q.banana_last) AS banana_last, q.watch_last, + q.last_version, g.g_account_name IS NOT NULL AS googleapps, + UNIX_TIMESTAMP(s.start) AS lastlogin, s.host, + a.is_admin, at.perms + FROM accounts AS a + INNER JOIN account_types AS at ON(a.type = at.type) + INNER JOIN auth_user_quick AS q ON(a.uid = q.user_id) + LEFT JOIN gapps_accounts AS g ON(a.uid = g.l_userid AND g.g_status = 'active') + LEFT JOIN logger.last_sessions AS ls ON (ls.uid = a.uid) + LEFT JOIN logger.sessions AS s ON(s.id = ls.id) + WHERE a.uid = {?} AND a.state = 'active'", $user->id()); $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); // Starts the session's logger, and sets up the permanent cookie. - if (S::has('suid')) { - $suid = S::v('suid'); - $logger = S::logger($uid); - $logger->log("suid_start", S::v('hruid') . " by " . $suid['hruid']); + if (S::suid()) { + S::logger()->log("suid_start", S::v('hruid') . ' by ' . S::suid('hruid')); } else { - $logger = S::logger($uid); - setcookie('ORGuid', $uid, (time() + 25920000), '/', '', 0); + S::logger()->saveLastSession(); + Cookie::set('uid', $user->id(), 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"); - } + if (S::i('auth_by_cookie') == $user->id() || Post::v('remember', 'false') == 'true') { + $this->setAccessCookie(false, S::i('auth_by_cookie') != $user->id()); } else { - setcookie('ORGaccess', '', time() - 3600, '/', '', 0); - if ($logger) { - $logger->log("cookie_off"); - } + $this->killAccessCookie(); } } // Finalizes the session setup. - S::set('perms', User::makePerms($perms)); + $this->makePerms($perms, S::b('is_admin')); $this->securityChecks(); $this->setSkin(); $this->updateNbNotifs(); @@ -271,11 +262,11 @@ 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); + $res = XDB::query('SELECT a.hruid + FROM aliases AS l + INNER JOIN accounts AS a ON (l.id = a.uid AND a.state = \'active\') + WHERE a.token = {?} AND l.alias = {?} AND l.type != \'homonyme\'', + $token, $login); if ($res->numRows() == 1) { $data = $res->fetchOneAssoc(); return new User($data['hruid'], $data); @@ -283,29 +274,19 @@ class XorgSession extends PlSession return null; } - public function makePerms($perm) + protected function makePerms($perm, $is_admin) { - $flags = new PlFlagSet(); - if ($perm == 'disabled' || $perm == 'ext') { - S::set('perms', $flags); - return; - } - $flags->addFlag(PERMS_USER); - if ($perm == 'admin') { - $flags->addFlag(PERMS_ADMIN); - } - S::set('perms', $flags); + S::set('perms', User::makePerms($perm, $is_admin)); } public function setSkin() { - global $globals; - if (S::logged() && (!S::has('skin') || S::has('suid'))) { + if (S::logged() && (!S::has('skin') || S::suid())) { $uid = S::v('uid'); - $res = XDB::query("SELECT skin_tpl - FROM auth_user_quick AS a - INNER JOIN skins AS s ON a.skin = s.id - WHERE user_id = {?} AND skin_tpl != ''", $uid); + $res = XDB::query('SELECT skin_tpl + FROM accounts AS a + INNER JOIN skins AS s on (a.skin = s.id) + WHERE a.uid = {?} AND skin_tpl != \'\'', S::i('uid')); S::set('skin', $res->fetchOneCell()); } } @@ -327,6 +308,28 @@ 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::suid() || ($replace && !Cookie::blank('access'))) { + return; + } + Cookie::set('access', sha1(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: