X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=91cda51423ef93ce01f5130b5956049cd5998739;hb=af7b379904c7dc2bdaf205cf1974ed48e66d6c21;hp=97e9a24bb5d9f4ba3840269762bd5540cb7d2538;hpb=de08a5eb35a0daa5ea1817532f02367e0f0edbec;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 97e9a24..91cda51 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -24,24 +24,20 @@ class XorgSession extends PlSession public function __construct() { parent::__construct(); - S::bootstrap('perms_backup', new PlFlagSet()); } public function startAvailableAuth() { - if (!(S::v('perms') instanceof PlFlagSet)) { - S::set('perms', S::v('perms_backup')); - } if (!S::logged()) { $cookie = $this->tryCookie(); if ($cookie == 0) { return $this->start(AUTH_COOKIE); - } else if ($cookie == 1 || $cooke == -2) { + } else if ($cookie == 1 || $cookie == -2) { return false; } } 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; } @@ -83,14 +79,26 @@ class XorgSession extends PlSession 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) { + 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); + 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); + } + } } } if ($response != $expected_response) { @@ -132,11 +140,10 @@ class XorgSession extends PlSession */ if (S::has('suid')) { $suid = S::v('suid'); - $login = $uname = $suid['forlife']; + $login = $uname = $suid['uid']; $redirect = false; } else { $uname = Env::v('username'); - if (Env::v('domain') == "alias") { $res = XDB::query('SELECT redirect FROM virtual @@ -155,17 +162,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'); @@ -180,61 +197,61 @@ 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']); - $res = XDB::query('SELECT u.user_id AS uid, prenom, prenom_ini, nom, nom_ini, nom_usage, perms, promo, promo_sortie, - matricule, password, FIND_IN_SET(\'femme\', u.flags) AS femme, - a.alias AS forlife, a2.alias AS bestalias, + + // 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 + 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) - INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type = \'a_vie\') - INNER JOIN aliases AS a2 ON (u.user_id = a2.id AND FIND_IN_SET(\'bestalias\', a2.flags)) - WHERE u.user_id = {?} AND u.perms IN(\'admin\', \'user\')', $uid); + 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) + LEFT JOIN logger.sessions AS s ON(s.id = ls.id) + WHERE u.user_id = {?} AND u.perms IN('admin', 'user')", $uid); $sess = $res->fetchOneAssoc(); $perms = $sess['perms']; unset($sess['perms']); - $res = XDB::query('SELECT UNIX_TIMESTAMP(s.start) AS lastlogin, s.host - FROM logger.sessions AS s - WHERE s.uid = {?} AND s.suid = 0 - ORDER BY s.start DESC - LIMIT 1', $uid); - if ($res->numRows()) { - $sess = array_merge($sess, $res->fetchOneAssoc()); - } - $suid = S::v('suid'); - if ($suid) { - $logger = S::logger(); - $logger->log("suid_start", S::v('forlife')." by {$suid['uid']}"); - $sess['suid'] = $suid; + // Loads the data into the real session. + $_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']); } else { - $logger = S::logger(); - //$logger->log("connexion", Env::v('n')); + $logger = S::logger($uid); + $logger->saveLastSession(); setcookie('ORGuid', $uid, (time() + 25920000), '/', '', 0); - if (Post::v('remember', 'false') == 'true') { + + if (S::i('auth_by_cookie') == $uid || Post::v('remember', 'false') == 'true') { $cookie = hash_encrypt($sess['password']); setcookie('ORGaccess', $cookie, (time() + 25920000), '/', '', 0); - if ($logger) { + 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"); } } - $_SESSION = array_merge($_SESSION, $sess); - $this->makePerms($perms); + // Finalizes the session setup. + S::set('perms', User::makePerms($perms)); $this->securityChecks(); $this->setSkin(); - update_NbNotifs(); + $this->updateNbNotifs(); check_redirect(); + + // We should not have to use this private data anymore + S::kill('auth_by_cookie'); return true; } @@ -260,12 +277,25 @@ 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); + if ($res->numRows() == 1) { + $data = $res->fetchOneAssoc(); + return new User($data['hruid'], $data); + } + return null; + } + public function makePerms($perm) { $flags = new PlFlagSet(); if ($perm == 'disabled' || $perm == 'ext') { S::set('perms', $flags); - S::set('perms_backup', $flags); return; } $flags->addFlag(PERMS_USER); @@ -273,12 +303,10 @@ class XorgSession extends PlSession $flags->addFlag(PERMS_ADMIN); } S::set('perms', $flags); - S::set('perms_backup', $flags); } public function setSkin() { - global $globals; if (S::logged() && (!S::has('skin') || S::has('suid'))) { $uid = S::v('uid'); $res = XDB::query("SELECT skin_tpl @@ -289,10 +317,23 @@ class XorgSession extends PlSession } } + public function loggedLevel() + { + return AUTH_COOKIE; + } + public function sureLevel() { return AUTH_MDP; } + + + 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()); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: