X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fauth.php;h=ca07e3229fd1ebeb617eabb3285b211c33ed4e4e;hb=a5878ac19cc6ea75a753470cf68b7d2180d6cd51;hp=92db93ae697ae574ba24e93c6c739b222e303b42;hpb=4c74588087c570a9adb1cd6b25cce60ca2f11f94;p=platal.git diff --git a/modules/auth.php b/modules/auth.php index 92db93a..ca07e32 100644 --- a/modules/auth.php +++ b/modules/auth.php @@ -1,6 +1,6 @@ $this->make_hook('chall', AUTH_PUBLIC), 'groupex/export-econfiance.php' - => $this->make_hook('econf', AUTH_PUBLIC), + => $this->make_hook('econf', AUTH_PUBLIC, 'user', NO_HTTPS), 'webservices/manageurs.php' - => $this->make_hook('manageurs', AUTH_PUBLIC), + => $this->make_hook('manageurs', AUTH_PUBLIC, 'user', NO_HTTPS), 'auth-redirect.php' => $this->make_hook('redirect', AUTH_COOKIE), - 'auth-groupex.php' => $this->make_hook('groupex', AUTH_COOKIE), + 'auth-groupex.php' => $this->make_hook('groupex_old', AUTH_COOKIE), + 'auth-groupex' => $this->make_hook('groupex', AUTH_COOKIE), 'admin/auth-groupes-x' => $this->make_hook('admin_authgroupesx', AUTH_MDP, 'admin'), ); } @@ -49,8 +50,6 @@ class AuthModule extends PLModule { global $globals; - require_once 'lists.inc.php'; - $cle = $globals->core->econfiance; if (S::v('chall') && $_GET['PASS'] == md5(S::v('chall').$cle)) { @@ -58,8 +57,8 @@ class AuthModule extends PLModule $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) { @@ -80,7 +79,7 @@ class AuthModule extends PLModule WHERE $where ORDER BY nom"); - $res = "\n\n\n\n"; + $res = "\n\n\n\n"; while (list ($prenom1,$nom1,$email1) = $all->next()) { $res .= "\n"; @@ -92,6 +91,7 @@ class AuthModule extends PLModule $res .= "\n\n"; + header('Content-Type: text/xml; charset="UTF-8"'); echo $res; } exit; @@ -110,7 +110,7 @@ class AuthModule extends PLModule 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']; + $request = @$GLOBALS['HTTP_RAW_POST_DATA']; $response = xmlrpc_server_call_method($server, $request, null); header('Content-Type: text/xml'); print $response; @@ -125,9 +125,15 @@ class AuthModule extends PLModule http_redirect(Env::v('dest', '/')); } - function handler_groupex(&$page) + function handler_groupex_old(&$page) + { + return $this->handler_groupex($page, 'iso-8859-1'); + } + + function handler_groupex(&$page, $charset = 'utf8') { require_once dirname(__FILE__).'/auth/auth.inc.php'; + $page->assign('referer', true); $gpex_pass = $_GET["pass"]; $gpex_url = urldecode($_GET["url"]); @@ -138,11 +144,13 @@ class AuthModule extends PLModule } /* a-t-on besoin d'ajouter le http:// ? */ - if (!preg_match("/^(http|https):\/\/.*/",$gpex_url)) + if (!preg_match("/^(http|https):\/\/.*/",$gpex_url)) { $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 + $uid = S::i('uid'); if (!isset($_SESSION['suid'])) { $logger = (isset($_SESSION['log']) && $_SESSION['log']->uid == $uid) ? $_SESSION['log'] : new CoreLogger($uid); @@ -151,28 +159,30 @@ class AuthModule extends PLModule } /* on parcourt les entrees de groupes_auth */ - $res = 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); + $returl = $gpex_url . gpex_make_params($gpex_challenge, $privkey, $datafields, $charset); http_redirect($returl); } } - /* si on n'a pas trouvé, on renvoit sur x.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) { - require_once('../classes/PLTableEditor.php'); + + 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'); + $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('privkey','clé privée',false); + $table_editor->describe('datafields','champs renvoyés',true); $table_editor->apply($page, $action, $id); - } + } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>