X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=6a92d9033592e25fa1f0a97d747e55f93e75a3cb;hb=b57e77e04468990dd5c20d9ddd7826c917e3d4e3;hp=1ce6bf72e081da7d2e7cd79ab15438430b24b321;hpb=6a61c46da5277473f01c6fbe3bacdcad81fee235;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 1ce6bf7..6a92d90 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; } @@ -51,14 +51,13 @@ class XorgSession extends PlSession return -1; } - $res = XDB::query('SELECT user_id, password - FROM auth_user_md5 - WHERE user_id = {?} AND perms IN(\'admin\', \'user\')', + $res = XDB::query('SELECT uid, password + FROM accounts + WHERE uid = {?} AND state = \'active\'', Cookie::i('ORGuid')); if ($res->numRows() != 0) { list($uid, $password) = $res->fetchOneRow(); - require_once 'secure_hash.inc.php'; - $expected_value = hash_encrypt($password); + $expected_value = sha1($password); if ($expected_value == Cookie::v('ORGaccess')) { S::set('auth_by_cookie', $uid); return 0; @@ -71,36 +70,14 @@ 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')); - if ($response != $expected_response && Env::has('xorpass') - && !preg_match('/^0*$/', Env::v('xorpass'))) { - $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); - - // Update the GoogleApps password as well, if required. - global $globals; - if ($globals->mailstorage->googleapps_domain) { - require_once 'googleapps.inc.php'; - $user = User::getSilent($uid); - $account = new GoogleAppsAccount($user); - if ($account->active() && $account->sync_password) { - $account->set_password($new_password); - } - } - } - } + $expected_response = sha1("$uname:$password:" . S::v('challenge')); + /* XXX: Deprecates len(password) > 10 conversion */ if ($response != $expected_response) { S::logger($uid)->log('auth_fail', 'bad password'); return null; @@ -140,11 +117,10 @@ class XorgSession extends PlSession */ if (S::has('suid')) { $suid = S::v('suid'); - $login = $uname = $suid['hruid']; + $login = $uname = $suid['uid']; $redirect = false; } else { $uname = Env::v('username'); - if (Env::v('domain') == "alias") { $res = XDB::query('SELECT redirect FROM virtual @@ -163,17 +139,27 @@ 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::has('suid')) { + $suid = S::v('suid'); + if ($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::has('suid')) { + if (Post::has('domain')) { + if (($domain = Post::v('domain', 'login')) == 'alias') { + setcookie('ORGdomain', "alias", (time() + 25920000), '/', '', 0); + } else { + setcookie('ORGdomain', '', (time() - 3600), '/', '', 0); + } + // pour que la modification soit effective dans le reste de la page + $_COOKIE['ORGdomain'] = $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'); @@ -188,23 +174,29 @@ class XorgSession extends PlSession } 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']); } - unset($_SESSION['log']); // Retrieves main user properties. - $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, - 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, - UNIX_TIMESTAMP(s.start) AS lastlogin, s.host - FROM auth_user_md5 AS u - INNER JOIN auth_user_quick AS q USING(user_id) - LEFT JOIN gapps_accounts AS g ON (u.user_id = g.l_userid AND g.g_status = 'active') - LEFT JOIN logger.last_sessions AS ls ON (ls.uid = u.user_id) + /** 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 */ + $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.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 + FROM accounts AS a + 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 u.user_id = {?} AND u.perms IN('admin', 'user')", $uid); + WHERE a.uid = {?} AND a.state = 'active'", $uid); $sess = $res->fetchOneAssoc(); $perms = $sess['perms']; unset($sess['perms']); @@ -219,19 +211,18 @@ class XorgSession extends PlSession $logger->log("suid_start", S::v('hruid') . " by " . $suid['hruid']); } else { $logger = S::logger($uid); + $logger->saveLastSession(); setcookie('ORGuid', $uid, (time() + 25920000), '/', '', 0); if (S::i('auth_by_cookie') == $uid || Post::v('remember', 'false') == 'true') { - $cookie = hash_encrypt($sess['password']); + $cookie = sha1($sess['password']); setcookie('ORGaccess', $cookie, (time() + 25920000), '/', '', 0); - if ($logger && S::i('auth_by_cookie') != $uid) { + if (S::i('auth_by_cookie') != $uid) { $logger->log("cookie_on"); } } else { setcookie('ORGaccess', '', time() - 3600, '/', '', 0); - if ($logger) { - $logger->log("cookie_off"); - } + $logger->log("cookie_off"); } } @@ -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); @@ -301,10 +292,10 @@ class XorgSession extends PlSession { if (S::logged() && (!S::has('skin') || S::has('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()); } }