From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 15 Aug 2010 15:00:55 +0000 (+0200)
Subject: 'groups' permission is mandatory to get authenticated on X.net.
X-Git-Tag: xorg/1.0.1~269
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7fd6dbb3c5864ff6160330ddf6571b774e15f602;p=platal.git

'groups' permission is mandatory to get authenticated on X.net.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/classes/user.php b/classes/user.php
index 1c22fef..8b9122f 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -184,7 +184,7 @@ class User extends PlUser
                                       IF (ab.alias IS NULL, NULL, CONCAT(ab.alias, \'@' . $globals->mail->domain . '\')) AS bestalias,
                                       IF (ab.alias IS NULL, NULL, CONCAT(ab.alias, \'@' . $globals->mail->domain2 . '\')) AS bestalias_alternate,
                                       a.email, a.full_name, a.directory_name, a.display_name, a.sex = \'female\' AS gender,
-                                      IF(a.state = \'active\', at.perms, \'\') AS perms,
+                                      IF(a.state = \'active\', CONCAT(at.perms, \',\', IF(a.user_perms IS NULL, \'\', a.user_perms)), \'\') AS perms,
                                       a.email_format, a.is_admin, a.state, a.type, a.skin,
                                       FIND_IN_SET(\'watch\', a.flags) AS watch, a.comment,
                                       a.weak_password IS NOT NULL AS weak_access, g.g_account_name IS NOT NULL AS googleapps,
@@ -780,6 +780,11 @@ class User extends PlUser
         if ($is_admin) {
             $flags->addFlag(PERMS_ADMIN);
         }
+
+        // Access to private directory implies access to 'less'-private version.
+        if ($flags->hasFlag('directory_private')) {
+            $flags->addFlag('directory_ax');
+        }
         return $flags;
     }
 
diff --git a/classes/xnetsession.php b/classes/xnetsession.php
index 5d9e07c..ceaa331 100644
--- a/classes/xnetsession.php
+++ b/classes/xnetsession.php
@@ -94,20 +94,28 @@ class XnetSession extends XorgSession
 
     protected function startSessionAs($user, $level)
     {
+        // The user must have 'groups' permission to access X.net
+        if (!$user->checkPerms('groups')) {
+            return false;
+        }
         if ($level == AUTH_SUID) {
             S::set('auth', AUTH_MDP);
         }
-        $res  = XDB::query("SELECT  a.uid, a.hruid, a.display_name, a.full_name,
-                                    a.sex = 'female' AS femme,
-                                    a.email_format, a.token,
-                                    at.perms, a.is_admin
-                              FROM  accounts AS a
-                        INNER JOIN  account_types AS at ON (at.type = a.type)
-                             WHERE  a.uid = {?} AND a.state = 'active'
-                             LIMIT  1", $user->id());
-        $sess = $res->fetchOneAssoc();
-        $_SESSION = array_merge($_SESSION, $sess);
-        $this->makePerms(S::s('perms'), S::user()->is_admin);
+
+        S::set('uid', $user->uid);
+        S::set('hruid', $user->hruid);
+
+        // XXX: Transition code, should not be in session anymore
+        S::set('display_name', $user->display_name);
+        S::set('full_name', $user->full_name);
+        S::set('femme', $user->isFemale());
+        S::set('email_format', $user->email_format);
+        S::set('token', $user->token);
+        S::set('perms', $user->perms);
+        S::set('is_admin', $user->is_admin);
+
+
+        $this->makePerms($user->perms, $user->is_admin);
         S::kill('challenge');
         S::kill('loginX');
         S::kill('may_update');
@@ -128,7 +136,7 @@ class XnetSession extends XorgSession
         if (!$this->startSUID($user)) {
             return false;
         }
-        S::set('perms', User::makePerms('user'));
+        S::set('perms', User::makePerms(PERMS_USER));
         return true;
     }
 
diff --git a/upgrade/1.0.1/02_accounts.sql b/upgrade/1.0.1/02_accounts.sql
index cdba8e1..db6d59a 100644
--- a/upgrade/1.0.1/02_accounts.sql
+++ b/upgrade/1.0.1/02_accounts.sql
@@ -1,4 +1,9 @@
-ALTER TABLE accounts ADD COLUMN directory_name VARCHAR(255) DEFAULT NULL AFTER full_name;
+ALTER TABLE accounts ADD COLUMN directory_name VARCHAR(255) DEFAULT NULL AFTER full_name,
+                     ADD COLUMN user_perms SET('groups', 'mail', 'directory_ax', 'directory_private',
+                                               'edit_directory', 'forums', 'lists', 'payment')
+                                           DEFAULT NULL
+                                           COMMENT "Extra permissions for the account in addition to those specified by the account type"
+                                           AFTER type;
 UPDATE  accounts AS a
    SET  a.directory_name = (SELECT  pd.directory_name
                               FROM  profile_display  AS pd