<?php
/***************************************************************************
- * Copyright (C) 2003-2006 Polytechnique.org *
+ * Copyright (C) 2003-2008 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
function handlers()
{
return array(
- 'groupex/done-chall.php'
+ 'groupex/donne-chall.php'
=> $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'),
);
}
- 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");
- $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) {
$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' )
WHERE $where
ORDER BY nom");
- $res = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n\n<membres>\n\n";
+ $res = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n<membres>\n\n";
while (list ($prenom1,$nom1,$email1) = $all->next()) {
$res .= "<membre>\n";
$res .= "</membres>\n\n";
+ header('Content-Type: text/xml; charset="UTF-8"');
echo $res;
}
exit;
}
- function manageurs(&$page)
+ function handler_manageurs(&$page)
{
global $globals;
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/methods.inc.php';
+ 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"]);
}
/* 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
+ $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']);
+ ? $_SESSION['log'] : new CoreLogger($uid);
+ global $platal;
+ $logger->log('connexion_auth_ext', $platal->path);
}
/* 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);
+ $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 */
- redirect('https://www.polytechnique.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');
+ $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->apply($page, $action, $id);
}
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>
projects / platal.git / blobdiff