X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fopenid.php;h=bdae55f612c4de76817b3cde76356d8d9016f896;hb=eab2f6f5f15c04fa35a5e5b89e2853370b74a3eb;hp=fc935b50e50780f195c2f18096a08c070e8d4f4c;hpb=087f7ecd118dc03c6ca291410963288c838cc01f;p=platal.git
diff --git a/modules/openid.php b/modules/openid.php
index fc935b5..bdae55f 100644
--- a/modules/openid.php
+++ b/modules/openid.php
@@ -1,6 +1,6 @@
$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),
);
}
function handler_openid(&$page, $x = null)
{
$this->load('openid.inc.php');
- $user = get_user($x);
- // 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, $user);
+ return $this->render_discovery_page($page, get_user($x));
}
- // Create a server and decode the request
+ // Now, deal with the OpenId message
$server = init_openid_server();
$request = $server->decodeRequest();
- // This request requires user interaction
- if (in_array($request->mode,
- array('checkid_immediate', 'checkid_setup'))) {
-
- // Each user has only one identity to choose from
- // So we can make automatically the identity selection
- if ($request->idSelect()) {
- $request->identity = get_user_openid_url($user);
- }
-
- // If we still don't have an identifier (used or desired), give up
- if (!$request->identity) {
- $this->render_no_identifier_page($page, $request);
- return;
- }
-
- // We always require confirmation before sending information
- // to third-party websites
- if ($request->immediate) {
- $response =& $request->answer(false);
- } else {
- // Save request in session and jump to confirmation page
- S::set('openid_request', serialize($request));
- pl_redirect('openid/trust');
- return;
- }
+ // In modes 'checkid_immediate' and 'checkid_setup', the request
+ // needs some logic and can not be automatically answered by the server
+
+ // Immediate mode
+ if ($request->mode == 'checkid_immediate') {
+
+ // We deny immediate requests, unless:
+ // - the user identifier is known by the RP
+ // - the user is logged in
+ // - the user identifier matches the user logged in
+ // - the user has whitelisted the site
+ $answer = !$request->idSelect()
+ && S::logged()
+ && $request->identity == S::user()->login()
+ && is_trusted_site(S::user(), $request->trust_root);
+ $response =& $request->answer($answer);
+
+ // Setup mode
+ } else if ($request->mode == 'checkid_setup') {
+
+ // We redirect to a page where the user will authenticate
+ // and confirm the use of his/her OpenId
+ $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
} else {
$response =& $server->handleRequest($request);
}
- // Render response
$webresponse =& $server->encodeResponse($response);
$this->render_openid_response($webresponse);
}
@@ -112,22 +127,29 @@ class OpenidModule extends PLModule
$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;
- } else {
- // Unserialize the request
- require_once 'Auth/OpenID/Server.php';
- $request = unserialize($request);
}
+ require_once 'Auth/OpenID/Server.php';
+ $request = unserialize($_SESSION[$request_id]);
+
$server = init_openid_server();
$user = S::user();
-
+ $identity = null;
+ $claimed_id = null;
+
+ // Set the identity to the user currently logged in
+ // if an OP Identifier was initially used
+ if ($request->identity == Auth_OpenID_IDENTIFIER_SELECT) {
+ $identity = $user->hruid;
+ $claimed_id = get_user_openid_url($user);
// Check that the identity matches the user currently logged in
- if ($request->identity != get_user_openid_url($user)) {
+ // if an User Identifier was initially used
+ } else if ($request->identity != $user->hruid) {
$response =& $request->answer(false);
$webresponse =& $server->encodeResponse($response);
$this->render_openid_response($webresponse);
@@ -139,63 +161,106 @@ class OpenidModule extends PLModule
$sreg_request = Auth_OpenID_SRegRequest::fromOpenIDRequest($request);
$sreg_response = Auth_OpenID_SRegResponse::extractResponse($sreg_request, get_sreg_data($user));
+ $whitelisted = is_trusted_site($user, $request->trust_root);
// Ask the user for confirmation
- if ($_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'
- // Answer to the Relying Party based on the user's choice
- if (isset($_POST['trust'])) {
- S::kill('openid_request');
- $response =& $request->answer(true, null, $request->identity);
+ // 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['openid_trust']) && @$_POST['openid_always']) {
+ add_trusted_site($user, $request->trust_root);
+ }
+
+ // Answer to the Relying Party
+ 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 { // !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)
{
- // Load constants
$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->changeTpl('openid/idp_xrds.tpl', NO_SKIN);
- $page->assign('type', Auth_OpenID_TYPE_2_0_IDP);
- $page->assign('uri', get_openid_url());
+ $page->assign('type2', Auth_OpenID_TYPE_2_0_IDP);
+ $page->assign('sreg', Auth_OpenID_SREG_URI);
+ $page->assign('provider', get_openid_url());
}
function handler_user_xrds(&$page, $x = null)
{
- // Load constants
$this->load('openid.inc.php');
- // Set XRDS content-type and template
+ $user = get_user($x);
+ if (is_null($user)) {
+ return PL_NOT_FOUND;
+ }
+
header('Content-type: application/xrds+xml');
$page->changeTpl('openid/user_xrds.tpl', NO_SKIN);
+ $page->assign('type2', Auth_OpenID_TYPE_2_0);
+ $page->assign('type1', Auth_OpenID_TYPE_1_1);
+ $page->assign('sreg', Auth_OpenID_SREG_URI);
+ $page->assign('provider', get_openid_url());
+ $page->assign('local_id', $user->hruid);
+ }
- // Set variables
- $page->assign('type1', Auth_OpenID_TYPE_2_0);
- $page->assign('type2', Auth_OpenID_TYPE_1_1);
- $page->assign('uri', get_openid_url());
+ function handler_melix(&$page, $x = null)
+ {
+ $this->load('openid.inc.php');
+ $user = get_user_by_alias($x);
+
+ // This will redirect to the canonic URL, which was not used
+ // if this hook was triggered
+ return $this->render_discovery_page(&$page, $user);
}
//--------------------------------------------------------------------//
@@ -208,50 +273,43 @@ class OpenidModule extends PLModule
pl_redirect('Xorg/OpenId');
}
+ // Redirect to the canonic URL if we are using an alias
+ // There might be a risk of redirection loop here
+ // if $_SERVER was not exactly what we expect
+ $current_url = 'http' . (empty($_SERVER['HTTPS']) ? '' : 's') . '://'
+ . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
+ $canonic_url = get_user_openid_url($user);
+ if ($current_url != $canonic_url) {
+ http_redirect($canonic_url);
+ }
+
// 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 tags for HTML-Based Discovery
+ // Set the 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_no_identifier_page($page, $request)
- {
- // Select template
- $page->changeTpl('openid/no_identifier.tpl');
- }
-
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