X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fauth.php;h=dae01536115f2dd7dd66ef864e1a6faa554f97ad;hb=d655dba1a05100bdd309200eb20409e848abf98c;hp=8550ae3b12a22b3f1e841649822ad430efab4f46;hpb=352fb10191f46abd6b0d309615c2fd23375ba646;p=platal.git

diff --git a/modules/auth.php b/modules/auth.php
index 8550ae3..dae0153 100644
--- a/modules/auth.php
+++ b/modules/auth.php
@@ -24,7 +24,7 @@ class AuthModule extends PLModule
     function handlers()
     {
         return array(
-            'groupex/done-chall.php'
+            'groupex/donne-chall.php'
                                 => $this->make_hook('chall',      AUTH_PUBLIC),
             'groupex/export-econfiance.php'
                                 => $this->make_hook('econf',      AUTH_PUBLIC),
@@ -34,6 +34,7 @@ class AuthModule extends PLModule
 
             'auth-redirect.php' => $this->make_hook('redirect',   AUTH_COOKIE),
             'auth-groupex.php'  => $this->make_hook('groupex',    AUTH_COOKIE),
+            'admin/auth-groupes-x'         => $this->make_hook('admin_authgroupesx', AUTH_MDP, 'admin'),
         );
     }
 
@@ -48,18 +49,15 @@ class AuthModule extends PLModule
     {
         global $globals;
 
-        require_once 'platal/xmlrpc-client.inc.php';
-        require_once 'lists.inc.php';
-
         $cle = $globals->core->econfiance;
 
-        if (Session::get('chall') && $_GET['PASS'] == md5(Session::get('chall').$cle)) {
+        if (S::v('chall') && $_GET['PASS'] == md5(S::v('chall').$cle)) {
 
-            $res  = $globals->xdb->query("SELECT password FROM auth_user_md5 WHERE user_id=10154");
+            $res  = XDB::query("SELECT password FROM auth_user_md5 WHERE user_id=10154");
             $pass = $res->fetchOneCell();
 
-            $client =& lists_xmlrpc(10154, $pass, "x-econfiance.polytechnique.org");
-            $members = $client->get_members('membres');
+            $list = new MMList(10154, $pass, "x-econfiance.polytechnique.org");
+            $members = $list->get_members('membres');
             if (is_array($members)) {
                 $membres = Array();
                 foreach($members[1] as $member) {
@@ -73,7 +71,7 @@ class AuthModule extends PLModule
 
             $where = join(' OR ',$membres);
 
-            $all = $globals->xdb->iterRow(
+            $all = XDB::iterRow(
                     "SELECT  u.prenom,u.nom,a.alias
                        FROM  auth_user_md5 AS u
                  INNER JOIN  aliases       AS a ON ( u.user_id = a.id AND a.type!='homonyme' )
@@ -103,7 +101,7 @@ class AuthModule extends PLModule
 
         require_once 'webservices/manageurs.server.inc.php';
 
-        $ips = array_flip(explode(' ',$globals->manageurs->authorized_ips));
+        $ips = array_flip(explode(' ', $globals->manageurs->authorized_ips));
         if ($ips && isset($ips[$_SERVER['REMOTE_ADDR']])) {
             $server = xmlrpc_server_create();
 
@@ -116,17 +114,17 @@ class AuthModule extends PLModule
             print $response;
             xmlrpc_server_destroy($server);
         }
+
+        exit;
     }
 
     function handler_redirect(&$page)
     {
-        redirect(Env::get('dest', '/'));
+        http_redirect(Env::v('dest', '/'));
     }
 
     function handler_groupex(&$page)
     {
-        global $globals;
-
         require_once dirname(__FILE__).'/auth/auth.inc.php';
 
         $gpex_pass = $_GET["pass"];
@@ -142,27 +140,36 @@ class AuthModule extends PLModule
             $gpex_url = "http://$gpex_url";
         $gpex_challenge = $_GET["challenge"];
 
-        // mise à jour de l'heure et de la machine de dernier login sauf quand on est en suid
+        // mise à jour de l'heure et de la machine de dernier login sauf quand on est en suid
         if (!isset($_SESSION['suid'])) {
             $logger = (isset($_SESSION['log']) && $_SESSION['log']->uid == $uid)
-                      ? $_SESSION['log']
-                      : new DiogenesCoreLogger($uid);
-            $logger->log('connexion_auth_ext', $_SERVER['PHP_SELF']);
+                            ? $_SESSION['log'] : new CoreLogger($uid);
+            global $platal;
+            $logger->log('connexion_auth_ext', $platal->path);
         }
 
         /* on parcourt les entrees de groupes_auth */
-        $res = $globals->xdb->iterRow('select privkey,name,datafields from groupesx_auth');
+        $res = XDB::iterRow('select privkey,name,datafields from groupesx_auth');
 
         while (list($privkey,$name,$datafields) = $res->next()) {
             if (md5($gpex_challenge.$privkey) == $gpex_pass) {
                 $returl = $gpex_url.gpex_make_params($gpex_challenge,$privkey,$datafields);
-                redirect($returl);
+                http_redirect($returl);
             }
         }
 
-        /* si on n'a pas trouvé, on renvoit sur x.org */
-        redirect('https://www.polytechnique.org/');
+        /* si on n'a pas trouvé, on renvoit sur x.org */
+        http_redirect('https://www.polytechnique.org/');
     }
+    function handler_admin_authgroupesx(&$page, $action = 'list', $id = null) {
+        $page->assign('xorg_title','Polytechnique.org - 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->apply($page, $action, $id);
+    }  
 }
 
 ?>