X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fauth.php;h=4599ab215564d08f3c3b03214b38021c36f3b3a8;hb=0001ba7a34dc3b535407cb1b961781c3c69c0ccd;hp=20098cb51f5d79240e85edb5840c9b3a16806c3f;hpb=493b6abebf3d6c35691f66fd1bfdc063efaab576;p=platal.git diff --git a/modules/auth.php b/modules/auth.php index 20098cb..4599ab2 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'), ); } @@ -51,43 +52,25 @@ class AuthModule extends PLModule $cle = $globals->core->econfiance; - 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(); + $res = "\n\n\n\n"; - $list = new MMList(10154, $pass, "x-econfiance.polytechnique.org"); + if (S::v('chall') && $_GET['PASS'] == md5(S::v('chall').$cle)) { + $list = new MMList(User::getWithUID(10154), "x-econfiance.polytechnique.org"); $members = $list->get_members('membres'); if (is_array($members)) { $membres = Array(); foreach($members[1] as $member) { - if (preg_match('/^([^.]*.[^.]*.(\d\d\d\d))@polytechnique.org$/', - $member[1], $matches)) - { - $membres[] = "a.alias='{$matches[1]}'"; + $user = User::getSilent($member[1]); + if ($user && $user->hasProfile()) { + $profile = $user->profile(); + $res .= "\n"; + $res .= "\t" . $profile->lastName() . "\n"; + $res .= "\t" . $profile->firstName() . "\n"; + $res .= "\t" . $user->forlifeEmail() . "\n"; + $res .= "\n\n"; } } } - - $where = join(' OR ',$membres); - - $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' ) - WHERE $where - ORDER BY nom"); - - $res = "\n\n\n\n"; - - while (list ($prenom1,$nom1,$email1) = $all->next()) { - $res .= "\n"; - $res .= "\t$nom1\n"; - $res .= "\t$prenom1\n"; - $res .= "\t$email1\n"; - $res .= "\n\n"; - } - $res .= "\n\n"; header('Content-Type: text/xml; charset="UTF-8"'); @@ -109,7 +92,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; @@ -124,9 +107,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"]; @@ -138,40 +126,46 @@ 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 - if (!isset($_SESSION['suid'])) { - $logger = (isset($_SESSION['log']) && $_SESSION['log']->uid == $uid) - ? $_SESSION['log'] : new CoreLogger($uid); + $uid = S::i('uid'); + if (!S::suid()) { 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'); + $res = XDB::iterRow('SELECT privkey, name, datafields, returnurls FROM groupesx_auth'); - while (list($privkey,$name,$datafields) = $res->next()) { + 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); + if (empty($returnurls) || @preg_match($returnurls, $gpex_url)) { + $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 */ 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'); + + 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: