From 7c5f327156b25e3b9d3acf2a1b31fc7ae9979440 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 7 Dec 2008 18:32:44 +0100 Subject: [PATCH] Trash dead code. Signed-off-by: Florent Bruneau --- include/xorg/session.inc.php | 335 ------------------------------------------- 1 file changed, 335 deletions(-) delete mode 100644 include/xorg/session.inc.php diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php deleted file mode 100644 index 3437515..0000000 --- a/include/xorg/session.inc.php +++ /dev/null @@ -1,335 +0,0 @@ -log("view_page", $_SERVER['REQUEST_URI']); - } - } - - // }}} - // {{{ public static function destroy() - - public static function destroy() - { - S::destroy(); - XorgSession::init(); - } - - // }}} - // {{{ public static function doAuth() - - public static function doAuth($new_name = false) - { - global $globals; - if (S::identified()) { // ok, c'est bon, on n'a rien à faire - return true; - } - - if (!Env::has('username') || !Env::has('response') - || !S::has('challenge')) - { - return false; - } - - // si on vient de recevoir une identification par passwordpromptscreen.tpl - // ou passwordpromptscreenlogged.tpl - if (S::has('suid')) { - $suid = S::v('suid'); - $login = $uname = $suid['forlife']; - $redirect = false; - } 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 = ""; - } - } else { - $login = $uname; - $redirect = false; - } - } - - $field = (!$redirect && preg_match('/^\d*$/', $uname)) ? 'id' : 'alias'; - $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.$field = {?} AND u.perms IN('admin','user')", $login); - - $logger = S::v('log'); - 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 - if (Env::v('response') != $expected_response) { - $new_password = hash_xor(Env::v('xorpass'), $password); - $expected_response = hash_encrypt("$uname:$new_password:".S::v('challenge')); - if (Env::v('response') == $expected_response) { - XDB::execute("UPDATE auth_user_md5 SET password = {?} WHERE user_id = {?}", - $new_password, $uid); - } - } - if (Env::v('response') == $expected_response) { - if (Env::has('domain')) { - if (($domain = Env::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; - } - - S::kill('challenge'); - if ($logger) { - $logger->log('auth_ok'); - } - if (!start_connexion($uid, true)) { - return false; - } - if (Env::v('remember', 'false') == 'true') { - $cookie = hash_encrypt(S::v('password')); - setcookie('ORGaccess',$cookie,(time()+25920000),'/','',0); - if ($logger) { - $logger->log("cookie_on"); - } - } else { - setcookie('ORGaccess', '', time() - 3600, '/', '', 0); - - if ($logger) { - $logger->log("cookie_off"); - } - } - return true; - } elseif ($logger) { - $logger->log('auth_fail','bad password'); - } - } elseif ($logger) { - $logger->log('auth_fail','bad login'); - } - - return false; - } - - // }}} - // {{{ public static function doAuthCookie() - - /** Try to do a cookie-based authentication. - * - * @param page the calling page (by reference) - */ - public static function doAuthCookie() - - { - if (S::logged()) { - return true; - } - - if (Env::has('username') and Env::has('response')) { - return XorgSession::doAuth(); - } - - if ($r = try_cookie()) { - return XorgSession::doAuth(($r > 0)); - } - - return false; - } - - // }}} - // {{{ 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 - * @return int 0 if all OK, -1 if no cookie, 1 if cookie with bad hash, - * -2 should not happen - */ -function try_cookie() -{ - if (Cookie::v('ORGaccess') == '' or !Cookie::has('ORGuid')) { - return -1; - } - - $res = @XDB::query( - "SELECT user_id,password FROM auth_user_md5 - WHERE user_id = {?} AND perms IN('admin','user')", - Cookie::i('ORGuid')); - - if ($res->numRows() != 0) { - list($uid, $password) = $res->fetchOneRow(); - require_once('secure_hash.inc.php'); - $expected_value = hash_encrypt($password); - if ($expected_value == Cookie::v('ORGaccess')) { - if (!start_connexion($uid, false)) { - return -3; - } - return 0; - } else { - return 1; - } - } - - return -2; -} - -// }}} -// {{{ 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 - * @return void - * @see controlpermanent.inc.php controlauthentication.inc.php - */ -function start_connexion ($uid, $identified) -{ - $res = XDB::query(" - SELECT u.user_id AS uid, 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, - nd.display AS display_name, nd.yourself AS yourself_name, - nd.firstname AS prenom, nd.lastname AS nom - 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)) - INNER JOIN profile_names_display AS nd ON (u.user_id = nd.user_id) - 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['uid']); - $logger->log("suid_start", S::v('forlife')." by {$suid['uid']}"); - $sess['suid'] = $suid; - } else { - $logger = S::v('log', new CoreLogger($uid)); - $logger->log("connexion", Env::v('n')); - setcookie('ORGuid', $uid, (time()+25920000), '/', '', 0); - } - - $_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')) { - 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(); - $newpage = false; - if (!Platal::page()) { - require_once 'xorg.inc.php'; - new_skinned_page('platal/index.tpl'); - $newpage = true; - } - Platal::page()->trigError("Une erreur est survenue lors de la procédure d'authentification. " - ."Merci de contacter au plus vite " - ."support@polytechnique.org"); - if ($newpage) { - Platal::page()->run(); - } - return false; - } - } - if ($mail_subject) { - send_warning_mail($mail_subject); - } - set_skin(); - update_NbNotifs(); - check_redirect(); - return true; -} - -// }}} - -function set_skin() -{ - global $globals; - 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()) { - return; - } - } -} - -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: -?> -- 2.1.4