<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2009 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
function handlers()
{
return array(
- 'openid' => $this->make_hook('openid', AUTH_PUBLIC),
- 'openid/trust' => $this->make_hook('trust', AUTH_COOKIE),
- 'openid/idp_xrds' => $this->make_hook('idp_xrds', AUTH_PUBLIC),
- 'openid/user_xrds' => $this->make_hook('user_xrds', AUTH_PUBLIC),
- 'openid/melix' => $this->make_hook('melix', AUTH_PUBLIC),
+ 'openid' => $this->make_hook('openid', AUTH_PUBLIC),
+ 'openid/trust' => $this->make_hook('trust', AUTH_COOKIE),
+ 'openid/trusted' => $this->make_hook('trusted', AUTH_MDP),
+ 'admin/openid/trusted' => $this->make_hook('admin_trusted', AUTH_MDP),
+ 'openid/idp_xrds' => $this->make_hook('idp_xrds', AUTH_PUBLIC),
+ 'openid/user_xrds' => $this->make_hook('user_xrds', AUTH_PUBLIC),
+ 'openid/melix' => $this->make_hook('melix', AUTH_PUBLIC),
);
}
{
$this->load('openid.inc.php');
- // Spec §4.1.2: if "openid.mode" is absent, whe SHOULD assume that
+ // Spec §4.1.2: if "openid.mode" is absent, we SHOULD assume that
// the request is not an OpenId message
- // Thus, we try to render the discovery page
if (!array_key_exists('openid_mode', $_REQUEST)) {
return $this->render_discovery_page($page, get_user($x));
}
// Now, deal with the OpenId message
- // Create a server and decode the request
$server = init_openid_server();
$request = $server->decodeRequest();
// - the user identifier is known by the RP
// - the user is logged in
// - the user identifier matches the user logged in
- // - the user and has whitelisted the site
+ // - the user has whitelisted the site
$answer = !$request->idSelect()
&& S::logged()
&& $request->identity == S::user()->login()
// We redirect to a page where the user will authenticate
// and confirm the use of his/her OpenId
- // Save request in session before jumping to confirmation page
- S::set('openid_request', serialize($request));
- pl_redirect('openid/trust');
+ $request_id = uniqid('openid-');
+ S::set($request_id, serialize($request));
+ $query = 'request_id=' . urlencode($request_id);
+ pl_redirect('openid/trust', $query);
return;
// Other requests can be automatically handled by the server
$response =& $server->handleRequest($request);
}
- // Render response
$webresponse =& $server->encodeResponse($response);
$this->render_openid_response($webresponse);
}
$this->load('openid.inc.php');
// Recover request in session
- $request = S::v('openid_request');
- if (is_null($request)) {
+ $request_id = $_GET['request_id'];
+ if (is_null($request_id) || !isset($_SESSION[$request_id])) {
// There is no authentication information, something went wrong
pl_redirect('/');
return;
}
- // Unserialize the request
require_once 'Auth/OpenID/Server.php';
- $request = unserialize($request);
+ $request = unserialize($_SESSION[$request_id]);
$server = init_openid_server();
$user = S::user();
$sreg_request = Auth_OpenID_SRegRequest::fromOpenIDRequest($request);
$sreg_response = Auth_OpenID_SRegResponse::extractResponse($sreg_request, get_sreg_data($user));
- // Check the whitelist
$whitelisted = is_trusted_site($user, $request->trust_root);
// Ask the user for confirmation
- if (!$whitelisted && $_SERVER['REQUEST_METHOD'] != 'POST') {
+ $from_trust_page = $_SERVER['REQUEST_METHOD'] == 'POST'
+ && (isset($_POST['openid_trust']) || isset($_POST['openid_cancel']));
+ if (!$whitelisted && !$from_trust_page) {
$page->changeTpl('openid/trust.tpl');
$page->assign('relying_party', $request->trust_root);
$page->assign_by_ref('sreg_data', $sreg_response->data);
+ $query = 'request_id=' . urlencode($request_id);
+ $page->assign('query', $query);
return;
}
- // At this point $_SERVER['REQUEST_METHOD'] == 'POST'
+ // If this point is reached, the user has just validated the form on the 'trust' page
+
+ // Remove the request from session since an answer will be sent
+ S::kill($request_id);
// Add 'always trusted' sites to whitelist
- if (isset($_POST['trust']) && @$_POST['always']) {
+ if (isset($_POST['openid_trust']) && @$_POST['openid_always']) {
add_trusted_site($user, $request->trust_root);
}
// Answer to the Relying Party
- if ($whitelisted || isset($_POST['trust'])) {
- S::kill('openid_request');
+ if ($whitelisted || isset($_POST['openid_trust'])) {
$response =& $request->answer(true, null, $identity, $claimed_id);
// Add the simple registration response values to the OpenID
// response message.
$sreg_response->toMessage($response->fields);
- } else { // !$whitelisted && !isset($_POST['trust'])
- S::kill('openid_request');
+ } else { // !$whitelisted && isset($_POST['openid_cancel'])
$response =& $request->answer(false);
}
- // Generate a response to send to the user agent.
$webresponse =& $server->encodeResponse($response);
$this->render_openid_response($webresponse);
}
+ function handler_trusted(&$page, $action = 'list', $id = null)
+ {
+ $page->setTitle('Sites tiers de confiance');
+ $page->assign('title', 'Mes sites tiers de confiance pour OpenId');
+ $table_editor = new PLTableEditor('openid/trusted', 'openid_trusted', 'id');
+ $table_editor->set_where_clause('user_id = ' . XDB::escape(S::user()->id()));
+ $table_editor->vars['user_id']['display'] = false;
+ $table_editor->describe('url', 'site tiers', true);
+ $page->assign('deleteonly', true);
+ $table_editor->apply($page, $action, $id);
+ }
+
+ function handler_admin_trusted(&$page, $action = 'list', $id = null)
+ {
+ $page->setTitle('Sites tiers de confiance');
+ $page->assign('title', 'Sites tiers de confiance globaux pour OpenId');
+ $table_editor = new PLTableEditor('admin/openid/trusted', 'openid_trusted', 'id');
+ $table_editor->set_where_clause('user_id IS NULL');
+ $table_editor->vars['user_id']['display'] = false;
+ $table_editor->describe('url', 'site tiers', true);
+ $page->assign('readonly', true);
+ $table_editor->apply($page, $action, $id);
+ }
+
function handler_idp_xrds(&$page)
{
$this->load('openid.inc.php');
-
- // Set XRDS content-type and template
header('Content-type: application/xrds+xml');
$page->changeTpl('openid/idp_xrds.tpl', NO_SKIN);
-
- // Set variables
$page->assign('type2', Auth_OpenID_TYPE_2_0_IDP);
$page->assign('sreg', Auth_OpenID_SREG_URI);
$page->assign('provider', get_openid_url());
{
$this->load('openid.inc.php');
- // Make sure the user exists
$user = get_user($x);
if (is_null($user)) {
return PL_NOT_FOUND;
}
- // Set XRDS content-type and template
header('Content-type: application/xrds+xml');
$page->changeTpl('openid/user_xrds.tpl', NO_SKIN);
-
- // Set variables
$page->assign('type2', Auth_OpenID_TYPE_2_0);
$page->assign('type1', Auth_OpenID_TYPE_1_1);
$page->assign('sreg', Auth_OpenID_SREG_URI);
// Include X-XRDS-Location response-header for Yadis discovery
header('X-XRDS-Location: ' . get_user_xrds_url($user));
- // Select template
$page->changeTpl('openid/openid.tpl');
-
- // Sets the title of the html page.
$page->setTitle($user->fullName());
-
- // Sets the <link> tags for HTML-Based Discovery
+ // Set the <link> tags for HTML-Based Discovery
$page->addLink('openid.server openid2.provider', get_openid_url());
$page->addLink('openid.delegate openid2.local_id', $user->hruid);
-
- // Adds the global user property array to the display.
$page->assign_by_ref('user', $user);
return;
function render_openid_response($webresponse)
{
- // Send HTTP response code
if ($webresponse->code != AUTH_OPENID_HTTP_OK) {
header(sprintf("HTTP/1.1 %d ", $webresponse->code),
true, $webresponse->code);
}
-
- // Send headers
foreach ($webresponse->headers as $k => $v) {
header("$k: $v");
}
header('Connection: close');
-
- // Send body
print $webresponse->body;
exit;
}
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
-?>
\ No newline at end of file
+?>
projects / platal.git / blobdiff