X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=ccae18faf40cb92fec8b001edd7c06a7319a78aa;hb=0c02607ec8d2a6aebac70a050c8f6b3a58ff566e;hp=59709d926a8cc0b9f76bcbca177e89a9f3a629c0;hpb=54906b8dc1d98edbf5ae919a7e4413fc8c1be384;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 59709d9..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,18 +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 uid, password FROM accounts WHERE uid = {?} AND state = \'active\'', - Cookie::i('ORGuid')); + Cookie::i('uid')); if ($res->numRows() != 0) { list($uid, $password) = $res->fetchOneRow(); $expected_value = sha1($password); - if ($expected_value == Cookie::v('ORGaccess')) { + if ($expected_value == Cookie::v('access')) { S::set('auth_by_cookie', $uid); return 0; } else { @@ -79,6 +79,11 @@ class XorgSession extends PlSession $expected_response = sha1("$uname:$password:" . S::v('challenge')); /* XXX: Deprecates len(password) > 10 conversion */ 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; } @@ -115,9 +120,8 @@ class XorgSession extends PlSession /** We come from an authentication form. */ - if (S::has('suid')) { - $suid = S::v('suid'); - $login = $uname = $suid['uid']; + if (S::suid()) { + $login = $uname = S::suid('uid'); $redirect = false; } else { $uname = Env::v('username'); @@ -140,9 +144,8 @@ class XorgSession extends PlSession } $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) { + if (!is_null($uid) && S::suid()) { + if (S::suid('uid') == $uid) { $uid = S::i('uid'); } else { $uid = null; @@ -150,26 +153,31 @@ class XorgSession extends PlSession } if (!is_null($uid)) { S::set('auth', AUTH_MDP); - if (!S::has('suid')) { + if (!S::suid()) { if (Post::has('domain')) { if (($domain = Post::v('domain', 'login')) == 'alias') { - setcookie('ORGdomain', "alias", (time() + 25920000), '/', '', 0); + Cookie::set('domain', 'alias', 300); } else { - setcookie('ORGdomain', '', (time() - 3600), '/', '', 0); + 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; @@ -177,26 +185,26 @@ class XorgSession extends PlSession if ($level == AUTH_SUID) { S::set('auth', AUTH_MDP); } - unset($_SESSION['log']); // 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: Switch to new permission system */ + /** 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.mail_format as mail_fmt, + 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, - IF(a.is_admin, 'admin', 'user') AS perms + 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'", $uid); + WHERE a.uid = {?} AND a.state = 'active'", $user->id()); $sess = $res->fetchOneAssoc(); $perms = $sess['perms']; unset($sess['perms']); @@ -205,31 +213,21 @@ class XorgSession extends PlSession $_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); - $logger->saveLastSession(); - 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 = sha1($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(); @@ -276,23 +274,14 @@ 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() { - 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 accounts AS a @@ -319,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: