aurel's bugs

[platal.git] / modules / auth.php

diff --git a/modules/auth.php b/modules/auth.php
index 34c2b30..81e6072 100644 (file)
--- a/modules/auth.php
+++ b/modules/auth.php
@@ -24,33 +24,37 @@ class AuthModule extends PLModule
     function handlers()
     {
         return array(
-            'groupex/done-chall.php'        => $this->make_hook('chall', AUTH_PUBLIC),
-            'groupex/export-econfiance.php' => $this->make_hook('econf', AUTH_PUBLIC),
+            'groupex/done-chall.php'
+                                => $this->make_hook('chall',      AUTH_PUBLIC),
+            'groupex/export-econfiance.php'
+                                => $this->make_hook('econf',      AUTH_PUBLIC),
 
-            'auth-redirect.php' => $this->make_hook('redirect', AUTH_COOKIE),
-            'auth-groupex.php'  => $this->make_hook('groupex',  AUTH_COOKIE),
+            'webservices/manageurs.php'
+                                => $this->make_hook('manageurs',  AUTH_PUBLIC),
+
+            'auth-redirect.php' => $this->make_hook('redirect',   AUTH_COOKIE),
+            'auth-groupex.php'  => $this->make_hook('groupex',    AUTH_COOKIE),
         );
     }
 
-    function chall(&$page)
+    function handler_chall(&$page)
     {
         $_SESSION["chall"] = uniqid(rand(), 1);
         echo $_SESSION["chall"] . "\n" . session_id();
         exit;
     }
 
-    function econf(&$page)
+    function handler_econf(&$page)
     {
         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");
@@ -68,7 +72,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' )
@@ -92,16 +96,35 @@ class AuthModule extends PLModule
         exit;
     }
 
+    function handler_manageurs(&$page)
+    {
+        global $globals;
+
+        require_once 'webservices/manageurs.server.inc.php';
+
+        $ips = array_flip(explode(' ',$globals->manageurs->authorized_ips));
+        if ($ips && isset($ips[$_SERVER['REMOTE_ADDR']])) {
+            $server = xmlrpc_server_create();
+
+            xmlrpc_server_register_method($server, 'get_annuaire_infos', 'get_annuaire_infos');
+            xmlrpc_server_register_method($server, 'get_nouveau_infos', 'get_nouveau_infos');
+
+            $request  = $GLOBALS['HTTP_RAW_POST_DATA'];
+            $response = xmlrpc_server_call_method($server, $request, null);
+            header('Content-Type: text/xml');
+            print $response;
+            xmlrpc_server_destroy($server);
+        }
+    }
+
     function handler_redirect(&$page)
     {
-        redirect(Env::get('dest', '/'));
+        http_redirect(Env::v('dest', '/'));
     }
 
     function handler_groupex(&$page)
     {
-        global $globals;
-
-        require_once dirname(__FILE__).'/auth/methods.inc.php';
+        require_once dirname(__FILE__).'/auth/auth.inc.php';
 
         $gpex_pass = $_GET["pass"];
         $gpex_url  = urldecode($_GET["url"]);
@@ -116,7 +139,7 @@ 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']
@@ -125,17 +148,17 @@ class AuthModule extends PLModule
         }
 
         /* 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/');
     }
 }