X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fauth.php;h=1601c582fc0a1bc911704d7f24c517ee04dd438d;hb=bd5ac0a242a1364b8c1419f037c7bb8778e22ba1;hp=0b767c3f501b902ce5af911e0fe2365903c1c78f;hpb=d4775fe2dea4db5e6ca3db4a6034bb03a8b711cc;p=platal.git

diff --git a/modules/auth.php b/modules/auth.php
index 0b767c3..1601c58 100644
--- a/modules/auth.php
+++ b/modules/auth.php
@@ -132,7 +132,7 @@ class AuthModule extends PLModule
 
     function handler_groupex(&$page, $charset = 'utf8')
     {
-        require_once dirname(__FILE__).'/auth/auth.inc.php';
+        $this->load('auth.inc.php');
         $page->assign('referer', true);
 
         $gpex_pass = $_GET["pass"];
@@ -151,20 +151,21 @@ class AuthModule extends PLModule
 
         // mise à jour de l'heure et de la machine de dernier login sauf quand on est en suid
         $uid = S::i('uid');
-        if (!isset($_SESSION['suid'])) {
-            $logger = (isset($_SESSION['log']) && $_SESSION['log']->uid == $uid)
-                            ? $_SESSION['log'] : new PlLogger($uid);
+        if (!S::suid()) {
             global $platal;
-            S::logger()->log('connexion_auth_ext', $platal->path);
+            S::logger($uid)->log('connexion_auth_ext', $platal->path);
         }
 
         /* on parcourt les entrees de groupes_auth */
-        $res = XDB::iterRow('SELECT privkey, name, datafields FROM groupesx_auth');
+        $res = XDB::iterRow('SELECT privkey, name, datafields, returnurls FROM groupesx_auth');
 
-        while (list($privkey,$name,$datafields) = $res->next()) {
+        while (list($privkey,$name,$datafields,$returnurls) = $res->next()) {
             if (md5($gpex_challenge.$privkey) == $gpex_pass) {
-                $returl = $gpex_url . gpex_make_params($gpex_challenge, $privkey, $datafields, $charset);
-                http_redirect($returl);
+                $returnurls = trim($returnurls);
+                if (empty($returnurls) || @preg_match($returnurls, $gpex_url)) {
+                    $returl = $gpex_url . gpex_make_params($gpex_challenge, $privkey, $datafields, $charset);
+                    http_redirect($returl);
+                }
             }
         }
 
@@ -174,12 +175,13 @@ class AuthModule extends PLModule
 
     function handler_admin_authgroupesx(&$page, $action = 'list', $id = null)
     {
-        $page->setTitle('Polytechnique.org - Administration - Auth groupes X');
+        $page->setTitle('Administration - Auth groupes X');
         $page->assign('title', 'Gestion de l\'authentification centralisée');
         $table_editor = new PLTableEditor('admin/auth-groupes-x','groupesx_auth','id');
         $table_editor->describe('name','nom',true);
         $table_editor->describe('privkey','clé privée',false);
         $table_editor->describe('datafields','champs renvoyés',true);
+        $table_editor->describe('returnurls','urls de retour',true);
         $table_editor->apply($page, $action, $id);
     }
 }