X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fsession.php;h=6eb5b3095ee8476a9c3d7ddbd5c9c24ae20fa368;hb=06df222b7962dd5b71b34ec1dd078276d7327dbc;hp=2ebaac2386983dae68f4c1cf17ae91d27c38737b;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/classes/session.php b/classes/session.php
index 2ebaac2..6eb5b30 100644
--- a/classes/session.php
+++ b/classes/session.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,9 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-global $lc_accent, $lc_plain, $uc_accent, $uc_plain;
-require_once 'diogenes/diogenes.misc.inc.php';
-
 class Session
 {
     public static function init()
@@ -30,6 +27,13 @@ class Session
         if (empty($_SESSION['challenge'])) {
             $_SESSION['challenge'] = sha1(uniqid(rand(), true));
         }
+        if (empty($_SESSION['xsrf_token'])) {
+            require_once 'xorg.misc.inc.php';
+            $_SESSION['xsrf_token'] = rand_url_id();
+        }
+        if (!isset($_SESSION['perms']) || !($_SESSION['perms'] instanceof FlagSet)) {
+            $_SESSION['perms'] = new FlagSet();
+        }
     }
 
     public static function destroy()
@@ -53,15 +57,25 @@ class Session
         return isset($_SESSION[$key]) ? $_SESSION[$key] : $default;
     }
 
+    public static function s($key, $default = '')
+    {
+        return (string)Session::v($key, $default);
+    }
+
     public static function i($key, $default = 0)
     {
         $i = Session::v($key, $default);
         return is_numeric($i) ? intval($i) : $default;
     }
 
+    public static function l(array $keys)
+    {
+        return array_map(array('Session', 'v'), $keys);
+    }
+
     public static function has_perms()
     {
-        return Session::logged() && Session::v('perms') == PERMS_ADMIN;
+        return Session::logged() && Session::v('perms')->hasFlag(PERMS_ADMIN);
     }
 
     public static function logged()
@@ -73,6 +87,27 @@ class Session
     {
         return Session::v('auth', AUTH_PUBLIC) >= AUTH_MDP;
     }
+
+    // Anti-XSRF protections.
+    public static function has_xsrf_token()
+    {
+        return Session::has('xsrf_token') && Session::v('xsrf_token') == Env::v('token');
+    }
+
+    public static function assert_xsrf_token()
+    {
+        if (!Session::has_xsrf_token()) {
+            global $page;
+            if ($page instanceof PlatalPage) {
+                $page->kill("L'opération n'a pas pu aboutir, merci de réessayer.");
+            }
+        }
+    }
+
+    public static function rssActivated()
+    {
+        return Session::has('core_rss_hash') && Session::v('core_rss_hash');
+    }
 }
 
 // {{{ function check_perms()
@@ -88,7 +123,7 @@ function check_perms()
         if ($_SESSION['log']) {
             $_SESSION['log']->log("noperms",$_SERVER['PHP_SELF']);
         }
-	$page->kill("Tu n'as pas les permissions nécessaires pour accéder à cette page.");
+        $page->kill("Tu n'as pas les permissions nécessaires pour accéder à cette page.");
     }
 }