openinfra/openstackid
Code Issues Proposed changes

Fix on OpenId 2.0 User Discovery

Browse Source 
https://openid.net/specs/openid-authentication-2_0.html#verify_disco
implementation has a bug, on X-XRDS-Location on user profile page
was publishing the wrong XRDS DOC, was issuing the doc for IDP, but
it needed the doc for the claimed identifier

Change-Id: I394a2517f771cc31340e0891dffc007279038d63
This commit is contained in:
Sebastian Marcet 2016-05-10 00:08:02 -03:00
parent ad3eb0207e
commit a842c9c0e7
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/openid/DiscoveryController.php
View File

@ -14,8 +14,8 @@ class DiscoveryController extends OpenIdController
public function __construct(IOpenIdProtocol $openid_protocol, IAuthService $auth_service, IServerConfigurationService $server_config_service) public function __construct(IOpenIdProtocol $openid_protocol, IAuthService $auth_service, IServerConfigurationService $server_config_service)
{ {
$this->openid_protocol = $openid_protocol; $this->openid_protocol = $openid_protocol;
$this->auth_service = $auth_service; $this->auth_service = $auth_service;
$this->server_config_service = $server_config_service; $this->server_config_service = $server_config_service;
} }
@ -46,12 +46,8 @@ class DiscoveryController extends OpenIdController
return View::make("404"); return View::make("404");
$local_identifier = $this->server_config_service->getUserIdentityEndpointURL($identifier); $local_identifier = $this->server_config_service->getUserIdentityEndpointURL($identifier);
if ($this->isDiscoveryRequest()) { $response = Response::make($this->openid_protocol->getXRDSDiscovery(IOpenIdProtocol::OpenIdXRDSModeUser, $local_identifier), 200);
$response = Response::make($this->openid_protocol->getXRDSDiscovery(IOpenIdProtocol::OpenIdXRDSModeUser, $local_identifier), 200); $this->setDiscoveryResponseType($response);
$this->setDiscoveryResponseType($response);
} else {
$response = View::make("identity");
}
return $response; return $response;
} }

2
app/views/identity.blade.php
View File

@ -3,7 +3,7 @@
<title>Welcome to OpenStackId</title> <title>Welcome to OpenStackId</title>
@stop @stop
@section('meta') @section('meta')
<meta http-equiv="X-XRDS-Location" content="{{ URL::action("DiscoveryController@idp")}}" /> <meta http-equiv="X-XRDS-Location" content="{{ URL::action("DiscoveryController@user", ['identifier'=> $identifier ])}}" />
@append @append
@section('content') @section('content')
<div class="container"> <div class="container">

10
other-requirements.txt Normal file
View File

@ -0,0 +1,10 @@
mcrypt
php5
php5-common
php5-cli
php5-mcrypt
php5-curl
php5-gd
php5-json
php5-mysql
php5-gmp