<?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();
public function startAvailableAuth()
{
if (!S::logged()) {
- $cookie = $this->tryCookie();
- if ($cookie == 0) {
- return $this->start(AUTH_COOKIE);
- } else if ($cookie == 1 || $cookie == -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;
}
}
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()
{
S::kill('auth_by_cookie');
if (Cookie::v('access') == '' || !Cookie::has('uid')) {
- return -1;
+ return self::NO_COOKIE;
}
$res = XDB::query('SELECT uid, password
Cookie::i('uid'));
if ($res->numRows() != 0) {
list($uid, $password) = $res->fetchOneRow();
- $expected_value = sha1($password);
- if ($expected_value == Cookie::v('access')) {
+ 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 a.uid, a.password
FROM accounts AS a
- INNER JOIN aliases AS l ON (l.id = a.uid AND l.type != \'homonyme\')
+ INNER JOIN aliases AS l ON (l.uid = a.uid AND l.type != \'homonyme\')
WHERE l.' . $login_type . ' = {?} AND a.state = \'active\'',
$login);
if (list($uid, $password) = $res->fetchOneRow()) {
$expected_response = sha1("$uname:$password:" . S::v('challenge'));
- /* XXX: Deprecates len(password) > 10 conversion */
+ /* Deprecates len(password) > 10 conversion. */
if ($response != $expected_response) {
if (!S::logged()) {
Platal::page()->trigError('Mot de passe ou nom d\'utilisateur invalide');
if (!S::logged()) {
S::set('auth', AUTH_COOKIE);
}
- return User::getSilentWithValues(null, array('user_id' => S::i('auth_by_cookie')));
+ return User::getSilentWithUID(S::i('auth_by_cookie'));
}
}
}
- $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && is_numeric($uname)) ? 'id' : 'alias');
+ $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && is_numeric($uname)) ? 'uid' : 'alias');
if (!is_null($uid) && S::suid()) {
if (S::suid('uid') == $uid) {
$uid = S::i('uid');
S::kill('challenge');
S::logger($uid)->log('auth_ok');
}
- return User::getSilentWithValues(null, array('user_id' => $uid));
+ return User::getSilentWithUID($uid);
}
protected function startSessionAs($user, $level)
{
- if ((!is_null(S::v('user')) && S::v('user')->id() != $user->id())
+ 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')) {
/** TODO: Move needed informations to account tables */
/** TODO: Currently suppressed data are matricule, promo */
/** TODO: Use the User object to fetch all this */
- $res = XDB::query("SELECT a.uid, a.hruid, a.display_name, a.full_name, a.password,
+ $res = XDB::query("SELECT a.uid, a.hruid, a.display_name, a.full_name,
a.sex = 'female' AS femme, a.email_format,
a.token, FIND_IN_SET('watch', a.flags) AS watch_account,
- UNIX_TIMESTAMP(fp.last_seen) AS banana_last, w.last AS watch_last,
+ UNIX_TIMESTAMP(fp.last_seen) AS banana_last,
a.last_version, g.g_account_name IS NOT NULL AS googleapps,
UNIX_TIMESTAMP(s.start) AS lastlogin, s.host,
a.is_admin, at.perms
- FROM accounts AS a
- INNER JOIN account_types AS at ON(a.type = at.type)
- INNER JOIN watch AS w ON(w.uid = a.uid)
- LEFT JOIN forum_profiles AS fp ON(fp.uid = a.uid)
- 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)
+ FROM accounts AS a
+ INNER JOIN account_types AS at ON (a.type = at.type)
+ LEFT JOIN watch AS w ON (w.uid = a.uid)
+ LEFT JOIN forum_profiles AS fp ON (fp.uid = a.uid)
+ LEFT JOIN gapps_accounts AS g ON (a.uid = g.l_userid AND g.g_status = 'active')
+ LEFT JOIN log_last_sessions AS ls ON (ls.uid = a.uid)
+ LEFT JOIN log_sessions AS s ON(s.id = ls.id)
WHERE a.uid = {?} AND a.state = 'active'", $user->id());
+ if ($res->numRows() != 1) {
+ return false;
+ }
+
$sess = $res->fetchOneAssoc();
$perms = $sess['perms'];
unset($sess['perms']);
public function tokenAuth($login, $token)
{
- $res = XDB::query('SELECT a.uid AS user_id, a.hruid
+ $res = XDB::query('SELECT a.uid, a.hruid
FROM aliases AS l
- INNER JOIN accounts AS a ON (l.id = a.uid AND a.state = \'active\')
+ 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) {
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());
+ $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::v('password')), 300, true);
+ Cookie::set('access', sha1(S::user()->password()), 300, true);
if ($log) {
S::logger()->log('cookie_on');
}
projects / platal.git / blobdiff