X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fauth.php;h=424361c4275d958313efbde4b3ad398346c22728;hb=1dc71da137a384e771723b8a893539a7f5cc9fab;hp=da708a541a59621a06d40fdde2f06740fc6b9198;hpb=08cce2ff528b38bde27cdec6d6bc28d6af4a42d4;p=platal.git diff --git a/modules/auth.php b/modules/auth.php index da708a5..424361c 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), + 'groupex/donne-chall.php' => $this->make_hook('chall', AUTH_PUBLIC), + 'groupex/export-econfiance.php' => $this->make_hook('econf', AUTH_PUBLIC, 'user', NO_HTTPS), - 'webservices/manageurs.php' - => $this->make_hook('manageurs', AUTH_PUBLIC), + 'webservices/manageurs.php' => $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-redirect.php' => $this->make_hook('redirect', 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'), ); } @@ -48,18 +47,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 = 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 +76,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 +88,7 @@ class AuthModule extends PLModule $res .= "\n\n"; + header('Content-Type: text/xml; charset="UTF-8"'); echo $res; } exit; @@ -103,31 +100,37 @@ 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(); 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; xmlrpc_server_destroy($server); } + + exit; } function handler_redirect(&$page) { - redirect(Env::get('dest', '/')); + http_redirect(Env::v('dest', '/')); } - function handler_groupex(&$page) + function handler_groupex_old(&$page) { - global $globals; + return $this->handler_groupex($page, 'iso-8859-1'); + } - require_once dirname(__FILE__).'/auth/auth.inc.php'; + function handler_groupex(&$page, $charset = 'utf8') + { + $this->load('auth.inc.php'); + $page->assign('referer', true); $gpex_pass = $_GET["pass"]; $gpex_url = urldecode($_GET["url"]); @@ -137,32 +140,53 @@ class AuthModule extends PLModule $gpex_url .= "&PHPSESSID=" . $_GET["session"]; } - /* a-t-on besoin d'ajouter le http:// ? */ - if (!preg_match("/^(http|https):\/\/.*/",$gpex_url)) + // Normalize the return 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 + // Update the last login information (unless the user is in SUID). + $uid = S::i('uid'); 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']); + global $platal; + 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'); - - while (list($privkey,$name,$datafields) = $res->next()) { + // Iterate over the auth token to find which one did sign the request. + $res = XDB::iterRow('SELECT privkey, name, datafields, returnurls FROM groupesx_auth'); + 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); - redirect($returl); + $returnurls = trim($returnurls); + // We check that the return url matches a per-key regexp to prevent + // replay attacks (more exactly to force replay attacks to redirect + // the user to the real GroupeX website, which defeats the attack). + if (empty($returnurls) || @preg_match($returnurls, $gpex_url)) { + $returl = $gpex_url . gpex_make_params($gpex_challenge, $privkey, $datafields, $charset); + http_redirect($returl); + } else if (S::admin()) { + $page->kill("La requête d'authentification a échouée (url de retour invalide)."); + } } } - /* si on n'a pas trouvé, on renvoit sur x.org */ - redirect('https://www.polytechnique.org/'); + // Otherwise (if no valid request was found, or if the return URL is not + // acceptable), the user is redirected back to our homepage. + pl_redirect('/'); + } + + function handler_admin_authgroupesx(&$page, $action = 'list', $id = null) + { + $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); } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>