X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg%2Fsession.inc.php;h=62f5d304e4b0685960dfe3d6f0f605bee03ebea8;hb=9fcc656556e911e89ecb0d9712785a19a7025da9;hp=515a8fe5bd16ca18a7f03784adbbb2456124d646;hpb=ccdbc270a4d0e98d88c1d7a29e8cb3c5f260bcef;p=platal.git diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php index 515a8fe..62f5d30 100644 --- a/include/xorg/session.inc.php +++ b/include/xorg/session.inc.php @@ -1,6 +1,6 @@ log("view_page", $_SERVER['REQUEST_URI']); } } @@ -51,7 +51,7 @@ class XorgSession public static function doAuth($new_name = false) { global $globals; - if (S::identified()) { // ok, c'est bon, on n'a rien à faire + if (S::identified()) { // ok, c'est bon, on n'a rien à faire return true; } @@ -99,7 +99,7 @@ class XorgSession if (list($uid, $password) = $res->fetchOneRow()) { require_once('secure_hash.inc.php'); $expected_response = hash_encrypt("$uname:$password:".S::v('challenge')); - // le password de la base est peut-être encore encodé en md5 + // le password de la base est peut-être encore encodé en md5 if (Env::v('response') != $expected_response) { $new_password = hash_xor(Env::v('xorpass'), $password); $expected_response = hash_encrypt("$uname:$new_password:".S::v('challenge')); @@ -158,6 +158,7 @@ class XorgSession * @param page the calling page (by reference) */ public static function doAuthCookie() + { if (S::logged()) { return true; @@ -175,11 +176,27 @@ class XorgSession } // }}} + // {{{ public static function make_perms() + + public static function &make_perms($perm) + { + $flags = new FlagSet(); + if ($perm == 'disabled' || $perm == 'ext') { + return $flags; + } + $flags->addFlag(PERMS_USER); + if ($perm == 'admin') { + $flags->addFlag(PERMS_ADMIN); + } + return $flags; + } + + // }}} } // {{{ function try_cookie() -/** réalise la récupération de $_SESSION pour qqn avec cookie +/** réalise la récupération de $_SESSION pour qqn avec cookie * @return int 0 if all OK, -1 if no cookie, 1 if cookie with bad hash, * -2 should not happen */ @@ -214,33 +231,39 @@ function try_cookie() // }}} // {{{ function start_connexion() -/** place les variables de session dépendants de auth_user_md5 - * et met à jour les dates de dernière connexion si nécessaire +/** place les variables de session dépendants de auth_user_md5 + * et met à jour les dates de dernière connexion si nécessaire * @return void * @see controlpermanent.inc.php controlauthentication.inc.php */ function start_connexion ($uid, $identified) { $res = XDB::query(" - SELECT u.user_id AS uid, prenom, nom, perms, promo, matricule, password, FIND_IN_SET('femme', u.flags) AS femme, - UNIX_TIMESTAMP(s.start) AS lastlogin, s.host, a.alias AS forlife, a2.alias AS bestalias, - q.core_mail_fmt AS mail_fmt, UNIX_TIMESTAMP(q.banana_last) AS banana_last, q.watch_last, q.core_rss_hash + 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, + 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 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)) - LEFT JOIN logger.sessions AS s ON (s.uid=u.user_id AND s.suid=0) - WHERE u.user_id = {?} AND u.perms IN('admin','user') - ORDER BY s.start DESC - LIMIT 1", $uid); + WHERE u.user_id = {?} AND u.perms IN('admin','user')", $uid); $sess = $res->fetchOneAssoc(); + $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 = new CoreLogger($uid, $suid); + $logger = new CoreLogger($uid, $suid['uid']); $logger->log("suid_start", S::v('forlife')." by {$suid['uid']}"); $sess['suid'] = $suid; - $sess['perms'] = $_SESSION['perms']; } else { $logger = S::v('log', new CoreLogger($uid)); $logger->log("connexion", Env::v('n')); @@ -250,18 +273,41 @@ function start_connexion ($uid, $identified) $_SESSION = array_merge($_SESSION, $sess); $_SESSION['log'] = $logger; $_SESSION['auth'] = ($identified ? AUTH_MDP : AUTH_COOKIE); + $_SESSION['perms'] =& XorgSession::make_perms($_SESSION['perms']); + $mail_subject = null; + if (check_account()) { + $mail_subject = "Connexion d'un utilisateur surveillé"; + } if (check_ip('unsafe')) { - send_warning_mail("Une IP surveillee a tente de se connecter"); + if ($mail_subject) { + $mail_subject .= ' - '; + } + $mail_subject .= "Une IP surveillee a tente de se connecter"; if (check_ip('ban')) { + send_warning_mail($mail_subject); $_SESSION = array(); + $_SESSION['perms'] = new FlagSet(); global $page; - $page->trig("Une erreur est survenue lors de la procédure d'authentification. " + $newpage = false; + if (!$page) { + require_once 'xorg.inc.php'; + new_skinned_page('platal/index.tpl'); + $newpage = true; + } + $page->trig("Une erreur est survenue lors de la procédure d'authentification. " ."Merci de contacter au plus vite " ."support@polytechnique.org"); + if ($newpage) { + $page->run(); + } return false; } } + if ($mail_subject) { + send_warning_mail($mail_subject); + } set_skin(); + update_NbNotifs(); check_redirect(); return true; } @@ -271,17 +317,17 @@ function start_connexion ($uid, $identified) function set_skin() { global $globals; - if (S::logged() && !S::has('skin')) { + 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); - if ($_SESSION['skin'] = $res->fetchOneCell()) { + $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); + if ($_SESSION['skin'] = $res->fetchOneCell()) { return; } } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>