X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=f46107c1a6479f7975a52af73e8f05394fbec356;hb=b3deda78968ebef05b64d84addd44eba82d39d46;hp=b1241b8459744ad82f6f4e8cfe2f189c3ca979b7;hpb=684195f33b11e3067200dd3a9e14304bd7d04463;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index b1241b8..f46107c 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -52,7 +52,7 @@ 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() { @@ -79,14 +79,21 @@ class XorgSession extends PlSession 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.uid = a.uid AND l.type != \'homonyme\') - WHERE l.' . $login_type . ' = {?} AND a.state = \'active\'', - $login); + if ($login_type == 'alias') { + $res = XDB::query('SELECT a.uid, a.password + FROM accounts AS a + INNER JOIN aliases AS l ON (l.uid = a.uid AND l.type != \'homonyme\') + WHERE l.alias = {?} AND a.state = \'active\'', + $login); + } else { + $res = XDB::query('SELECT uid, password + FROM accounts + WHERE ' . $login_type . ' = {?}', + $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'); @@ -132,10 +139,11 @@ class XorgSession extends PlSession */ if (S::suid()) { $login = $uname = S::suid('uid'); + $loginType = 'uid'; $redirect = false; } else { - $uname = Env::v('username'); - if (Env::v('domain') == "alias") { + $uname = Post::v('username'); + if (Post::s('domain') == "alias") { $res = XDB::query('SELECT redirect FROM virtual INNER JOIN virtual_redirect USING(vid) @@ -147,13 +155,19 @@ class XorgSession extends PlSession } else { $login = ''; } + $loginType = 'alias'; + } else if (Post::s('domain') == "ax") { + $login = $uname; + $redirect = false; + $loginType = 'hruid'; } else { $login = $uname; $redirect = false; + $loginType = is_numeric($uname) ? 'uid' : 'alias'; } } - $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && is_numeric($uname)) ? 'uid' : 'alias'); + $uid = $this->checkPassword($uname, $login, Post::v('response'), $loginType); if (!is_null($uid) && S::suid()) { if (S::suid('uid') == $uid) { $uid = S::i('uid'); @@ -165,8 +179,11 @@ class XorgSession extends PlSession S::set('auth', AUTH_MDP); if (!S::suid()) { if (Post::has('domain')) { - if (($domain = Post::v('domain', 'login')) == 'alias') { + $domain = Post::v('domain', 'login'); + if ($domain == 'alias') { Cookie::set('domain', 'alias', 300); + } else if ($domain == 'ax') { + Cookie::set('domain', 'ax', 300); } else { Cookie::kill('domain'); } @@ -190,35 +207,8 @@ class XorgSession extends PlSession S::set('auth', AUTH_MDP); } - // Retrieves main user properties. - /** TODO: Move needed informations to account tables */ - /** TODO: Currently suppressed data are matricule, promo */ - /** TODO: Use the User object to fetch all this */ - $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, UNIX_TIMESTAMP(w.last) AS watch_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) - 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']); - - // Loads the data into the real session. - $_SESSION = array_merge($_SESSION, $sess); + // Loads uid and hruid into the session for developement conveniance. + $_SESSION = array_merge($_SESSION, array('uid' => $user->id(), 'hruid' => $user->hruid, 'token' => $user->token, 'user' => $user)); // Starts the session's logger, and sets up the permanent cookie. if (S::suid()) { @@ -235,7 +225,7 @@ class XorgSession extends PlSession } // Finalizes the session setup. - $this->makePerms($perms, S::b('is_admin')); + $this->makePerms($user->perms, $user->is_admin); $this->securityChecks(); $this->setSkin(); $this->updateNbNotifs(); @@ -270,11 +260,10 @@ class XorgSession extends PlSession public function tokenAuth($login, $token) { - $res = XDB::query('SELECT a.uid AS user_id, a.hruid - FROM aliases AS l - 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); + $res = XDB::query('SELECT a.uid, a.hruid + FROM accounts AS a + WHERE a.token = {?} AND a.hruid = {?} AND a.state = \'active\'', + $token, $login); if ($res->numRows() == 1) { return new User(null, $res->fetchOneAssoc()); }