X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=4224920971c81484ad1e9b12da40833cdccec284;hb=7a12b2ca5eae8fbbdf0b32e43a2d8c2c6bd705ab;hp=76bc5b01a3b55cb190ac47541d7b269c5ac22d6a;hpb=7d15f750bbe068c9633ca4f4a4c0c3d0ca7ab6a1;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 76bc5b0..4224920 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -1,6 +1,6 @@ tryCookie(); - if ($cookie == 0) { - return $this->start(AUTH_COOKIE); - } else if ($cookie == 1 || $cookie == -2) { + switch ($this->tryCookie()) { + case self::COOKIE_SUCCESS: + if (!$this->start(AUTH_COOKIE)) { + return false; + } + break; + + case self::INVALID_USER: + case self::INVALID_COOKIE: return false; } } @@ -42,13 +52,13 @@ class XorgSession extends PlSession return true; } - /** Check the cookie and set the associated user_id in the auth_by_cookie session variable. + /** Check the cookie and set the associated uid in the auth_by_cookie session variable. */ private function tryCookie() { S::kill('auth_by_cookie'); if (Cookie::v('access') == '' || !Cookie::has('uid')) { - return -1; + return self::NO_COOKIE; } $res = XDB::query('SELECT uid, password @@ -57,27 +67,26 @@ class XorgSession extends PlSession Cookie::i('uid')); if ($res->numRows() != 0) { list($uid, $password) = $res->fetchOneRow(); - $expected_value = sha1($password); - if ($expected_value == Cookie::v('access')) { + if (sha1($password) == Cookie::v('access')) { S::set('auth_by_cookie', $uid); - return 0; + return self::COOKIE_SUCCESS; } else { - return 1; + return self::INVALID_COOKIE; } } - return -2; + return self::INVALID_USER; } private function checkPassword($uname, $login, $response, $login_type) { $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\') + INNER JOIN aliases AS l ON (l.uid = a.uid AND l.type != \'homonyme\') WHERE l.' . $login_type . ' = {?} AND a.state = \'active\'', $login); if (list($uid, $password) = $res->fetchOneRow()) { $expected_response = sha1("$uname:$password:" . S::v('challenge')); - /* XXX: Deprecates len(password) > 10 conversion */ + /* Deprecates len(password) > 10 conversion. */ if ($response != $expected_response) { if (!S::logged()) { Platal::page()->trigError('Mot de passe ou nom d\'utilisateur invalide'); @@ -89,6 +98,7 @@ class XorgSession extends PlSession } return $uid; } + Platal::page()->trigError('Mot de passe ou nom d\'utilisateur invalide'); return null; } @@ -108,7 +118,7 @@ class XorgSession extends PlSession if (!S::logged()) { S::set('auth', AUTH_COOKIE); } - return User::getSilentWithValues(null, array('user_id' => S::i('auth_by_cookie'))); + return User::getSilentWithUID(S::i('auth_by_cookie')); } @@ -143,7 +153,7 @@ class XorgSession extends PlSession } } - $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && is_numeric($uname)) ? 'id' : 'alias'); + $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && is_numeric($uname)) ? 'uid' : 'alias'); if (!is_null($uid) && S::suid()) { if (S::suid('uid') == $uid) { $uid = S::i('uid'); @@ -165,12 +175,12 @@ class XorgSession extends PlSession S::kill('challenge'); S::logger($uid)->log('auth_ok'); } - return User::getSilentWithValues(null, array('user_id' => $uid)); + return User::getSilentWithUID($uid); } protected function startSessionAs($user, $level) { - if ((!is_null(S::v('user')) && S::v('user')->id() != $user->id()) + if ((!is_null(S::user()) && S::user()->id() != $user->id()) || (S::has('uid') && S::i('uid') != $user->id())) { return false; } else if (S::has('uid')) { @@ -183,23 +193,26 @@ class XorgSession extends PlSession // Retrieves main user properties. /** 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, + $res = XDB::query("SELECT a.uid, a.hruid, a.display_name, a.full_name, a.sex = 'female' AS femme, a.email_format, a.token, FIND_IN_SET('watch', a.flags) AS watch_account, - UNIX_TIMESTAMP(fp.last_seen) AS banana_last, q.watch_last, - q.last_version, g.g_account_name IS NOT NULL AS googleapps, + UNIX_TIMESTAMP(fp.last_seen) AS banana_last, + a.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 forum_profiles AS fp ON(fp.uid = a.uid) - 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) + FROM accounts AS a + INNER JOIN account_types AS at ON (a.type = at.type) + LEFT JOIN watch AS w ON (w.uid = a.uid) + LEFT JOIN forum_profiles AS fp ON (fp.uid = a.uid) + LEFT JOIN gapps_accounts AS g ON (a.uid = g.l_userid AND g.g_status = 'active') + LEFT JOIN log_last_sessions AS ls ON (ls.uid = a.uid) + LEFT JOIN log_sessions AS s ON(s.id = ls.id) WHERE a.uid = {?} AND a.state = 'active'", $user->id()); + if ($res->numRows() != 1) { + return false; + } + $sess = $res->fetchOneAssoc(); $perms = $sess['perms']; unset($sess['perms']); @@ -257,9 +270,9 @@ class XorgSession extends PlSession public function tokenAuth($login, $token) { - $res = XDB::query('SELECT a.uid AS user_id, a.hruid + $res = XDB::query('SELECT a.uid, a.hruid FROM aliases AS l - INNER JOIN accounts AS a ON (l.id = a.uid AND a.state = \'active\') + INNER JOIN accounts AS a ON (l.uid = a.uid AND a.state = \'active\') WHERE a.token = {?} AND l.alias = {?} AND l.type != \'homonyme\'', $token, $login); if ($res->numRows() == 1) { @@ -276,7 +289,6 @@ class XorgSession extends PlSession public function setSkin() { if (S::logged() && (!S::has('skin') || S::suid())) { - $uid = S::v('uid'); $res = XDB::query('SELECT skin_tpl FROM accounts AS a INNER JOIN skins AS s on (a.skin = s.id) @@ -299,15 +311,16 @@ class XorgSession extends PlSession public function updateNbNotifs() { require_once 'notifs.inc.php'; - $n = select_notifs(false, S::i('uid'), S::v('watch_last'), false); - S::set('notifs', $n->numRows()); + $user = S::user(); + $n = Watch::getCount($user); + S::set('notifs', $n); } public function setAccessCookie($replace = false, $log = true) { if (S::suid() || ($replace && !Cookie::blank('access'))) { return; } - Cookie::set('access', sha1(S::v('password')), 300, true); + Cookie::set('access', sha1(S::user()->password()), 300, true); if ($log) { S::logger()->log('cookie_on'); }