X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=815ad816b6dfff144ceb4efdd586ecf9dbc988e3;hb=8429b76b6af3586ea1801ec7e0bce7bc385b9b3f;hp=b1241b8459744ad82f6f4e8cfe2f189c3ca979b7;hpb=684195f33b11e3067200dd3a9e14304bd7d04463;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index b1241b8..815ad81 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -1,6 +1,6 @@ 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,28 +139,34 @@ class XorgSession extends PlSession */ if (S::suid()) { $login = $uname = S::suid('uid'); - $redirect = false; + $loginType = 'uid'; } else { - $uname = Env::v('username'); - if (Env::v('domain') == "alias") { - $res = XDB::query('SELECT redirect - FROM virtual - INNER JOIN virtual_redirect USING(vid) - WHERE alias LIKE {?}', - $uname . '@' . $globals->mail->alias_dom); - $redirect = $res->fetchOneCell(); - if ($redirect) { - $login = substr($redirect, 0, strpos($redirect, '@')); - } else { - $login = ''; + $uname = Post::v('username'); + if (Post::s('domain') == "alias") { + $login = XDB::fetchOneCell('SELECT uid + FROM email_source_account + WHERE email = {?} AND type = \'alias_aux\'', + $uname); + $loginType = 'uid'; + } else if (Post::s('domain') == 'hruid') { + $login = $uname; + $loginType = 'hruid'; + } else if ((Post::s('domain') == 'email')) { + $login = XDB::fetchOneCell('SELECT SQL_CALC_FOUND_ROWS uid + FROM accounts + WHERE email = {?}', + $uname); + if (!(XDB::fetchOneCell('SELECT FOUND_ROWS()') == 1)) { + $login =null; } + $loginType = 'uid'; } 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 +178,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 +206,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 +224,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(); @@ -268,13 +257,60 @@ class XorgSession extends PlSession } } + /** + * The authentication schema is based on three query parameters: + * ?user=×tamp=&sig= + * where: + * - hruid is the hruid of the querying user + * - timestamp is the current UNIX timestamp, which has to be within a + * given distance of the server-side UNIX timestamp + * - sig is the HMAC of "###" using + * a known secret of the user as the key. + * + * At the moment, the shared secret of the user is the sha1 hash of its + * password. This is temporary, though, until better support for tokens is + * implemented in plat/al. + * TODO(vzanotti): Switch to dedicated secrets for authentication. + */ + public function apiAuth($method, $resource, $payload) + { + // Verify that the timestamp is within acceptable bounds. + $timestamp = Env::i('timestamp', 0); + if (abs($timestamp - time()) > Platal::globals()->api->timestamp_tolerance) { + return null; + } + + // Retrieve the user corresponding to the forlife. Note that at the + // moment, other aliases are also accepted. + $user = User::getSilent(Env::s('user', '')); + if (is_null($user) || !$user->isActive()) { + return null; + } + + // Determine the list of tokens associated with the user. At the moment, + // this is just the sha1 of the password. + $tokens = array($user->password()); + + // For each token, try to validate the signature. + $message = implode('#', array($method, $resource, $payload, $timestamp)); + $signature = Env::s('sig'); + foreach ($tokens as $token) { + $expected_signature = hash_hmac( + Platal::globals()->api->hmac_algo, $message, $token); + if ($signature == $expected_signature) { + return $user; + } + } + + return null; + } + 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()); }