X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fauth.php;h=99bce24f28c50c3995435130b8f2e2cf5309d99d;hb=e97df22eacc433a9982aad507f980b303d5fa2c1;hp=166790312a24c07681df1cc0d00d6e5fcc01a781;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git diff --git a/modules/auth.php b/modules/auth.php index 1667903..99bce24 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), - 'admin/auth-groupes-x' => $this->make_hook('admin_authgroupesx', AUTH_MDP, 'admin'), + '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'), ); } @@ -78,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"; @@ -90,7 +88,7 @@ class AuthModule extends PLModule $res .= "\n\n"; - header('Content-Type: text/xml; charset="ISO-8859-1"'); + pl_content_headers("text/xml"); echo $res; } exit; @@ -109,9 +107,9 @@ 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'); + pl_content_headers("text/xml"); print $response; xmlrpc_server_destroy($server); } @@ -124,9 +122,14 @@ class AuthModule extends PLModule http_redirect(Env::v('dest', '/')); } - function handler_groupex(&$page) + function handler_groupex_old(&$page) { - require_once dirname(__FILE__).'/auth/auth.inc.php'; + return $this->handler_groupex($page, 'iso-8859-1'); + } + + function handler_groupex(&$page, $charset = 'utf8') + { + $this->load('auth.inc.php'); $page->assign('referer', true); $gpex_pass = $_GET["pass"]; @@ -137,41 +140,52 @@ 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 CoreLogger($uid); global $platal; - $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'); - - 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); - http_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 */ - http_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->assign('xorg_title','Polytechnique.org - Administration - Auth groupes X'); + + 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: