<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
class XorgSession extends PlSession
{
+ const INVALID_USER = -2;
+ const NO_COOKIE = -1;
+ const COOKIE_SUCCESS = 0;
+ const INVALID_COOKIE = 1;
+
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) {
+ switch ($this->tryCookie()) {
+ case self::COOKIE_SUCCESS:
+ if (!$this->start(AUTH_COOKIE)) {
+ return false;
+ }
+ break;
+
+ case self::INVALID_USER:
+ case self::INVALID_COOKIE:
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;
}
- /** Check the cookie and set the associated user_id in the auth_by_cookie session variable.
+ /** Check the cookie and set the associated uid in the auth_by_cookie session variable.
*/
private function tryCookie()
{
- Platal::page()->trigError("Trying cookie");
S::kill('auth_by_cookie');
- if (Cookie::v('ORGaccess') == '' || !Cookie::has('ORGuid')) {
- return -1;
+ if (Cookie::v('access') == '' || !Cookie::has('uid')) {
+ return self::NO_COOKIE;
}
- $res = XDB::query('SELECT user_id, password
- FROM auth_user_md5
- WHERE user_id = {?} AND perms IN(\'admin\', \'user\')',
- Cookie::i('ORGuid'));
+ $res = XDB::query('SELECT uid, password
+ FROM accounts
+ WHERE uid = {?} AND state = \'active\'',
+ Cookie::i('uid'));
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 (sha1($password) == Cookie::v('access')) {
S::set('auth_by_cookie', $uid);
- return 0;
+ return self::COOKIE_SUCCESS;
} else {
- return 1;
+ return self::INVALID_COOKIE;
}
}
- return -2;
+ return self::INVALID_USER;
}
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\')',
- $login);
+ if ($login_type == 'alias') {
+ $res = XDB::query('SELECT a.uid, a.password
+ FROM accounts AS a
+ INNER JOIN aliases AS l ON (l.uid = a.uid AND l.type != \'homonyme\')
+ WHERE l.alias = {?} AND a.state = \'active\'',
+ $login);
+ } else {
+ $res = XDB::query('SELECT uid, password
+ FROM accounts
+ WHERE ' . $login_type . ' = {?}',
+ $login);
+ }
if (list($uid, $password) = $res->fetchOneRow()) {
- require_once 'secure_hash.inc.php';
- $expected_response = hash_encrypt("$uname:$password:" . S::v('challenge'));
+ $expected_response = sha1("$uname:$password:" . S::v('challenge'));
+ /* Deprecates len(password) > 10 conversion. */
if ($response != $expected_response) {
- $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);
+ if (!S::logged()) {
+ Platal::page()->trigError('Mot de passe ou nom d\'utilisateur invalide');
+ } else {
+ Platal::page()->trigError('Mot de passe invalide');
}
- }
- if ($response != $expected_response) {
S::logger($uid)->log('auth_fail', 'bad password');
return null;
}
return $uid;
}
+ Platal::page()->trigError('Mot de passe ou nom d\'utilisateur invalide');
return null;
}
if (!S::logged()) {
S::set('auth', AUTH_COOKIE);
}
- return S::i('auth_by_cookie');
+ return User::getSilentWithUID(S::i('auth_by_cookie'));
}
/* We want to do auth... we must have infos from a form.
*/
- if (!Env::has('username') || !Env::has('response') || !S::has('challenge')) {
+ if (!Post::has('username') || !Post::has('response') || !S::has('challenge')) {
return null;
}
/** We come from an authentication form.
*/
- if (S::has('suid')) {
- $suid = S::v('suid');
- $login = $uname = $suid['forlife'];
+ if (S::suid()) {
+ $login = $uname = S::suid('uid');
+ $loginType = 'uid';
$redirect = false;
} else {
- $uname = Env::v('username');
-
- if (Env::v('domain') == "alias") {
+ $uname = Post::v('username');
+ if (Post::s('domain') == "alias") {
$res = XDB::query('SELECT redirect
FROM virtual
INNER JOIN virtual_redirect USING(vid)
} else {
$login = '';
}
+ $loginType = 'alias';
+ } else if (Post::s('domain') == "ax") {
+ $login = $uname;
+ $redirect = false;
+ $loginType = 'hruid';
} else {
$login = $uname;
$redirect = false;
+ $loginType = is_numeric($uname) ? 'uid' : 'alias';
}
}
- $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && preg_match('/^\d*$/', $uname)) ? 'id' : 'alias');
+ $uid = $this->checkPassword($uname, $login, Post::v('response'), $loginType);
+ if (!is_null($uid) && S::suid()) {
+ if (S::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::suid()) {
+ if (Post::has('domain')) {
+ $domain = Post::v('domain', 'login');
+ if ($domain == 'alias') {
+ Cookie::set('domain', 'alias', 300);
+ } else if ($domain == 'ax') {
+ Cookie::set('domain', 'ax', 300);
+ } else {
+ 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::getSilentWithUID($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 ((!is_null(S::user()) && S::user()->id() != $user->id())
+ || (S::has('uid') && S::i('uid') != $user->id())) {
return false;
} else if (S::has('uid')) {
return true;
}
- if ($level == -1) {
- S::set('auth', AUTH_COOKIE);
- }
- 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,
- 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))
- 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());
+ if ($level == AUTH_SUID) {
+ S::set('auth', AUTH_MDP);
}
- $suid = S::v('suid');
- if ($suid) {
- $logger = S::logger();
- $logger->log("suid_start", S::v('forlife')." by {$suid['uid']}");
- $sess['suid'] = $suid;
+ // Loads uid and hruid into the session for developement conveniance.
+ $_SESSION = array_merge($_SESSION, array('uid' => $user->id(), 'hruid' => $user->hruid));
+
+ // Starts the session's logger, and sets up the permanent cookie.
+ if (S::suid()) {
+ S::logger()->log("suid_start", S::v('hruid') . ' by ' . S::suid('hruid'));
} else {
- $logger = S::logger();
- //$logger->log("connexion", Env::v('n'));
- setcookie('ORGuid', $uid, (time() + 25920000), '/', '', 0);
- if (Post::v('remember', 'false') == 'true') {
- $cookie = hash_encrypt($sess['password']);
- setcookie('ORGaccess', $cookie, (time() + 25920000), '/', '', 0);
- if ($logger) {
- $logger->log("cookie_on");
- }
+ S::logger()->saveLastSession();
+ Cookie::set('uid', $user->id(), 300);
+
+ 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();
}
}
- $_SESSION = array_merge($_SESSION, $sess);
- $this->makePerms($perms);
+ // Finalizes the session setup.
+ $this->makePerms($user->perms, $user->is_admin);
$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;
}
}
}
- public function makePerms($perm)
+ public function tokenAuth($login, $token)
{
- $flags = new PlFlagSet();
- if ($perm == 'disabled' || $perm == 'ext') {
- S::set('perms', $flags);
- S::set('perms_backup', $flags);
- return;
- }
- $flags->addFlag(PERMS_USER);
- if ($perm == 'admin') {
- $flags->addFlag(PERMS_ADMIN);
+ $res = XDB::query('SELECT a.uid, a.hruid
+ FROM aliases AS l
+ INNER JOIN accounts AS a ON (l.uid = a.uid AND a.state = \'active\')
+ WHERE a.token = {?} AND l.alias = {?} AND l.type != \'homonyme\'',
+ $token, $login);
+ if ($res->numRows() == 1) {
+ return new User(null, $res->fetchOneAssoc());
}
- S::set('perms', $flags);
- S::set('perms_backup', $flags);
+ return null;
+ }
+
+ protected function makePerms($perm, $is_admin)
+ {
+ S::set('perms', User::makePerms($perm, $is_admin));
}
public function setSkin()
{
- 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 (S::logged() && (!S::has('skin') || S::suid())) {
+ $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());
}
}
+ public function loggedLevel()
+ {
+ return AUTH_COOKIE;
+ }
+
public function sureLevel()
{
return AUTH_MDP;
}
+
+
+ public function updateNbNotifs()
+ {
+ require_once 'notifs.inc.php';
+ $user = S::user();
+ $n = Watch::getCount($user);
+ S::set('notifs', $n);
+ }
+
+ public function setAccessCookie($replace = false, $log = true) {
+ if (S::suid() || ($replace && !Cookie::blank('access'))) {
+ return;
+ }
+ Cookie::set('access', sha1(S::user()->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:
projects / platal.git / blobdiff