openinfra
/
openstackid
Code Issues Proposed changes

* fix on access token revoke 

* improved tokens generation
* fixed some typos

Change-Id: Id95265d6e62dddbea4d4929e34915571614cd102
This commit is contained in:
Sebastian Marcet 2016-03-23 11:10:44 -03:00
parent 8f65e27cae
commit 4178c95bde
9 changed files with 161 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/apis/ClientApiController.php
View File

@ -432,8 +432,8 @@ final class ClientApiController extends AbstractRESTController implements ICRUDC
if (is_null($token)) {
return $this->error404(array('error' => sprintf('access token %s does not exists!', $value)));
}
if ($token->getClientId() !== $client->client_id) {
return $this->error404(array(
if (intval($token->getClientId()) !== intval($client->id)) {
return $this->error412(array(
'error' => sprintf('access token %s does not belongs to client id !', $value, $id)
));
}
@ -445,8 +445,8 @@ final class ClientApiController extends AbstractRESTController implements ICRUDC
if (is_null($token)) {
return $this->error404(array('error' => sprintf('refresh token %s does not exists!', $value)));
}
if ($token->getClientId() !== $client->client_id) {
return $this->error404(array(
if (intval($token->getClientId()) !== intval($client->id)) {
return $this->error412(array(
'error' => sprintf('refresh token %s does not belongs to client id !', $value, $id)
));
}

10
app/libs/oauth2/models/AccessToken.php
View File

@ -95,4 +95,12 @@ class AccessToken extends Token {
public function fromJSON($json){
}
}
/**
* @return string
*/
public function getType()
{
return 'access_token';
}
}

8
app/libs/oauth2/models/AuthorizationCode.php
View File

@ -300,4 +300,12 @@ class AuthorizationCode extends Token
public function fromJSON($json)
{
}
/**
* @return string
*/
public function getType()
{
return 'auth_code';
}
}

8
app/libs/oauth2/models/RefreshToken.php
View File

@ -70,4 +70,12 @@ class RefreshToken extends Token {
{
// TODO: Implement fromJSON() method.
}
/**
* @return string
*/
public function getType()
{
return 'refresh_token';
}
}

10
app/libs/openid/model/OpenIdNonce.php
View File

@ -106,4 +106,12 @@ final class OpenIdNonce extends Identifier
return $nonce->setValue($value);
}
}
/**
* @return string
*/
public function getType()
{
return 'nonce';
}
}

5
app/libs/utils/model/Identifier.php
View File

@ -89,4 +89,9 @@ abstract class Identifier
$this->value = $value;
return $this;
}
/**
* @return string
*/
abstract public function getType();
}

5
app/libs/utils/services/UniqueIdentifierGenerator.php
View File

@ -15,6 +15,7 @@
namespace utils\services;
use utils\model\Identifier;
use Zend\Crypt\Hash;
/**
* Class UniqueIdentifierGenerator
@ -42,11 +43,9 @@ abstract class UniqueIdentifierGenerator implements IdentifierGenerator
*/
public function generate(Identifier $identifier){
$reflect = new \ReflectionClass($identifier);
$class_name = strtolower($reflect->getShortName());
do
{
$key = sprintf("%s.value.%s", $class_name, $this->_generate($identifier)->getValue());
$key = sprintf("%s.%s", $identifier->getType(), Hash::compute('sha256', $this->_generate($identifier)->getValue()));
}
while(!$this->cache_service->addSingleValue($key, $key));
return $identifier;

2
app/routes.php
View File

@ -156,7 +156,7 @@ Route::group(array('prefix' => 'admin/api/v1', 'before' => 'ssl|auth'), function
});
// resouce servers
// resource servers
Route::group(array('prefix' => 'resource-servers', 'before' => 'oauth2.server.admin.json'), function () {
Route::get('/{id}', "ApiResourceServerController@get");
Route::get('/', "ApiResourceServerController@getByPage");

116
app/tests/OIDCProtocolTest.php
View File

@ -88,7 +88,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
}
public function testLoginWithTralingSpace()
public function testLoginWithTrailingSpace()
{
$client_id = 'Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client';
@ -839,6 +839,120 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
}
public function testFlowNativeDisplay(){
$client_id = 'Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client';
$client_secret = 'ITc/6Y5N7kOtGKhgITc/6Y5N7kOtGKhgITc/6Y5N7kOtGKhgITc/6Y5N7kOtGKhg';
$params = array(
'client_id' => $client_id,
'redirect_uri' => 'https://www.test.com/oauth2',
'response_type' => 'code',
'scope' => sprintf('%s profile email address %s', OAuth2Protocol::OpenIdConnect_Scope, OAuth2Protocol::OfflineAccess_Scope),
OAuth2Protocol::OAuth2Protocol_LoginHint => 'sebastian@tipit.net',
OAuth2Protocol::OAuth2Protocol_Nonce => 'test_nonce',
OAuth2Protocol::OAuth2Protocol_Prompt => sprintf('%s %s',OAuth2Protocol::OAuth2Protocol_Prompt_Login, OAuth2Protocol::OAuth2Protocol_Prompt_Consent),
OAuth2Protocol::OAuth2Protocol_MaxAge => 3200,
OAuth2Protocol::OAuth2Protocol_Display => OAuth2Protocol::OAuth2Protocol_Display_Native
);
$response = $this->action("POST", "OAuth2ProviderController@authorize",
$params,
array(),
array(),
array());
$this->assertResponseStatus(302);
$response = $this->call('GET', $response->getTargetUrl());
$this->assertResponseStatus(412);
$json_response = json_decode($response->getContent(),true);
// do login
$response = $this->call($json_response['method'], $json_response['url'],
array
(
'username' => 'sebastian@tipit.net',
'password' => '1qaz2wsx',
'_token' => $json_response['required_params_valid_values']["_token"]
)
);
$this->assertResponseStatus(302);
$response = $this->action("GET", "OAuth2ProviderController@authorize",
array(),
array(),
array(),
array());
$this->assertResponseStatus(302);
$response = $this->action('GET', 'UserController@getConsent');
$this->assertResponseStatus(412);
$json_response = json_decode($response->getContent(),true);
$response = $this->call($json_response['method'], $json_response['url'], array(
'trust' => 'AllowOnce',
'_token' => $json_response['required_params_valid_values']["_token"]
));
$this->assertResponseStatus(302);
// get auth code
$response = $this->action("GET", "OAuth2ProviderController@authorize",
array(),
array(),
array(),
array());
$this->assertResponseStatus(302);
$url = $response->getTargetUrl();
$comps = @parse_url($url);
$query = $comps['query'];
$output = array();
parse_str($query, $output);
$this->assertTrue(array_key_exists('code', $output));
$this->assertTrue(!empty($output['code']));
$params = array(
'code' => $output['code'],
'redirect_uri' => 'https://www.test.com/oauth2',
'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
);
$response = $this->action("POST", "OAuth2ProviderController@token",
$params,
array(),
array(),
// Symfony interally prefixes headers with "HTTP", so
array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
$this->assertResponseStatus(200);
$this->assertEquals('application/json;charset=UTF-8', $response->headers->get('Content-Type'));
$content = $response->getContent();
$response = json_decode($content);
$access_token = $response->access_token;
$refresh_token = $response->refresh_token;
$id_token = $response->id_token;
$this->assertTrue(!empty($access_token));
$this->assertTrue(!empty($refresh_token));
$this->assertTrue(!empty($id_token));
}
public function testGetRefreshTokenFromNativeAppNTimes($n=5)
{
$client_id = 'Jiz87D8/Vcvr6fvQbH4HyNgwKlfSyQ3x.android.openstack.client';