ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-11-01 16:33:07 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/resourceConfig' into develop

Browse Source
This commit is contained in:
Alex Bilbie 2012-12-12 11:44:04 +00:00
commit 8131d5be90
7 changed files with 213 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -29,7 +29,7 @@
{ {
"name": "Alex Bilbie", "name": "Alex Bilbie",
"email": "hello@alexbilbie.com", "email": "hello@alexbilbie.com",
"homepage": "http://www.httpster.org", "homepage": "http://www.alexbilbie.com",
"role": "Developer" "role": "Developer"
} }
], ],

2
sql/database.sql
View File

@ -20,7 +20,7 @@ CREATE TABLE `client_endpoints` (
-- Create syntax for TABLE 'oauth_sessions' -- Create syntax for TABLE 'oauth_sessions'
CREATE TABLE `oauth_sessions` ( CREATE TABLE `oauth_sessions` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT, `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`client_id` varchar(32) NOT NULL DEFAULT '', `client_id` varchar(40) NOT NULL DEFAULT '',
`redirect_uri` varchar(250) NOT NULL DEFAULT '', `redirect_uri` varchar(250) NOT NULL DEFAULT '',
`owner_type` enum('user','client') NOT NULL DEFAULT 'user', `owner_type` enum('user','client') NOT NULL DEFAULT 'user',
`owner_id` varchar(255) DEFAULT NULL, `owner_id` varchar(255) DEFAULT NULL,

138
src/Oauth2/Authentication/Database.php
View File

@ -6,30 +6,42 @@ interface Database
{ {
/** /**
* Validate a client * Validate a client
* *
* Database query: * Database query:
* *
* <code> * <code>
* # Client ID + redirect URI * # Client ID + redirect URI
* SELECT clients.id FROM clients LEFT JOIN client_endpoints ON * SELECT clients.id FROM clients LEFT JOIN client_endpoints ON
* client_endpoints.client_id = clients.id WHERE clients.id = $clientId AND * client_endpoints.client_id = clients.id WHERE clients.id = $clientId AND
* client_endpoints.redirect_uri = $redirectUri * client_endpoints.redirect_uri = $redirectUri
* *
* # Client ID + client secret * # Client ID + client secret
* SELECT clients.id FROM clients WHERE clients.id = $clientId AND * SELECT clients.id FROM clients WHERE clients.id = $clientId AND
* clients.secret = $clientSecret * clients.secret = $clientSecret
* *
* # Client ID + client secret + redirect URI * # Client ID + client secret + redirect URI
* SELECT clients.id FROM clients LEFT JOIN client_endpoints ON * SELECT clients.id FROM clients LEFT JOIN client_endpoints ON
* client_endpoints.client_id = clients.id WHERE clients.id = $clientId AND * client_endpoints.client_id = clients.id WHERE clients.id = $clientId AND
* clients.secret = $clientSecret AND client_endpoints.redirect_uri = * clients.secret = $clientSecret AND client_endpoints.redirect_uri =
* $redirectUri * $redirectUri
* </code> * </code>
* *
* @param string $clientId The client's ID * Response:
*
* <code>
* Array
* (
* [client_id] => (string) The client ID
* [client secret] => (string) The client secret
* [redirect_uri] => (string) The redirect URI used in this request
* [name] => (string) The name of the client
* )
* </code>
*
* @param string $clientId The client's ID
* @param string $clientSecret The client's secret (default = "null") * @param string $clientSecret The client's secret (default = "null")
* @param string $redirectUri The client's redirect URI (default = "null") * @param string $redirectUri The client's redirect URI (default = "null")
* @return [type] [description] * @return bool|array Returns false if the validation fails, array on success
*/ */
public function validateClient( public function validateClient(
$clientId, $clientId,
@ -39,16 +51,16 @@ interface Database
/** /**
* Create a new OAuth session * Create a new OAuth session
* *
* Database query: * Database query:
* *
* <code> * <code>
* INSERT INTO oauth_sessions (client_id, redirect_uri, owner_type, * INSERT INTO oauth_sessions (client_id, redirect_uri, owner_type,
* owner_id, auth_code, access_token, stage, first_requested, last_updated) * owner_id, auth_code, access_token, stage, first_requested, last_updated)
* VALUES ($clientId, $redirectUri, $type, $typeId, $authCode, * VALUES ($clientId, $redirectUri, $type, $typeId, $authCode,
* $accessToken, $stage, UNIX_TIMESTAMP(NOW()), UNIX_TIMESTAMP(NOW())) * $accessToken, $stage, UNIX_TIMESTAMP(NOW()), UNIX_TIMESTAMP(NOW()))
* </code> * </code>
* *
* @param string $clientId The client ID * @param string $clientId The client ID
* @param string $redirectUri The redirect URI * @param string $redirectUri The redirect URI
* @param string $type The session owner's type (default = "user") * @param string $type The session owner's type (default = "user")
@ -56,7 +68,7 @@ interface Database
* @param string $authCode The authorisation code (default = "null") * @param string $authCode The authorisation code (default = "null")
* @param string $accessToken The access token (default = "null") * @param string $accessToken The access token (default = "null")
* @param string $stage The stage of the session (default ="request") * @param string $stage The stage of the session (default ="request")
* @return [type] [description] * @return int The session ID
*/ */
public function newSession( public function newSession(
$clientId, $clientId,
@ -71,20 +83,20 @@ interface Database
/** /**
* Update an OAuth session * Update an OAuth session
* *
* Database query: * Database query:
* *
* <code> * <code>
* UPDATE oauth_sessions SET auth_code = $authCode, access_token = * UPDATE oauth_sessions SET auth_code = $authCode, access_token =
* $accessToken, stage = $stage, last_updated = UNIX_TIMESTAMP(NOW()) WHERE * $accessToken, stage = $stage, last_updated = UNIX_TIMESTAMP(NOW()) WHERE
* id = $sessionId * id = $sessionId
* </code> * </code>
* *
* @param string $sessionId The session ID * @param string $sessionId The session ID
* @param string $authCode The authorisation code (default = "null") * @param string $authCode The authorisation code (default = "null")
* @param string $accessToken The access token (default = "null") * @param string $accessToken The access token (default = "null")
* @param string $stage The stage of the session (default ="request") * @param string $stage The stage of the session (default ="request")
* @return void * @return void
*/ */
public function updateSession( public function updateSession(
$sessionId, $sessionId,
@ -96,16 +108,16 @@ interface Database
/** /**
* Delete an OAuth session * Delete an OAuth session
* *
* <code> * <code>
* DELETE FROM oauth_sessions WHERE client_id = $clientId AND owner_type = * DELETE FROM oauth_sessions WHERE client_id = $clientId AND owner_type =
* $type AND owner_id = $typeId * $type AND owner_id = $typeId
* </code> * </code>
* *
* @param string $clientId The client ID * @param string $clientId The client ID
* @param string $type The session owner's type * @param string $type The session owner's type
* @param string $typeId The session owner's ID * @param string $typeId The session owner's ID
* @return [type] [description] * @return void
*/ */
public function deleteSession( public function deleteSession(
$clientId, $clientId,
@ -115,16 +127,16 @@ interface Database
/** /**
* Validate that an authorisation code is valid * Validate that an authorisation code is valid
* *
* Database query: * Database query:
* *
* <code> * <code>
* SELECT id FROM oauth_sessions WHERE client_id = $clientID AND * SELECT id FROM oauth_sessions WHERE client_id = $clientID AND
* redirect_uri = $redirectUri AND auth_code = $authCode * redirect_uri = $redirectUri AND auth_code = $authCode
* </code> * </code>
* *
* Response: * Response:
* *
* <code> * <code>
* Array * Array
* ( * (
@ -141,12 +153,12 @@ interface Database
* last updated * last updated
* ) * )
* </code> * </code>
* *
* @param string $clientId The client ID * @param string $clientId The client ID
* @param string $redirectUri The redirect URI * @param string $redirectUri The redirect URI
* @param string $authCode The authorisation code * @param string $authCode The authorisation code
* @return int|bool Returns the session ID if the auth code * @return int|bool Returns the session ID if the auth code
* is valid otherwise returns false * is valid otherwise returns false
*/ */
public function validateAuthCode( public function validateAuthCode(
$clientId, $clientId,
@ -156,18 +168,18 @@ interface Database
/** /**
* Return the session ID for a given session owner and client combination * Return the session ID for a given session owner and client combination
* *
* Database query: * Database query:
* *
* <code> * <code>
* SELECT id FROM oauth_sessions WHERE client_id = $clientId * SELECT id FROM oauth_sessions WHERE client_id = $clientId
* AND owner_type = $type AND owner_id = $typeId * AND owner_type = $type AND owner_id = $typeId
* </code> * </code>
* *
* @param string $type The session owner's type * @param string $type The session owner's type
* @param string $typeId The session owner's ID * @param string $typeId The session owner's ID
* @param string $clientId The client ID * @param string $clientId The client ID
* @return string|null Return the session ID as an integer if * @return string|null Return the session ID as an integer if
* found otherwise returns false * found otherwise returns false
*/ */
public function hasSession( public function hasSession(
@ -178,13 +190,13 @@ interface Database
/** /**
* Return the access token for a given session * Return the access token for a given session
* *
* Database query: * Database query:
* *
* <code> * <code>
* SELECT access_token FROM oauth_sessions WHERE id = $sessionId * SELECT access_token FROM oauth_sessions WHERE id = $sessionId
* </code> * </code>
* *
* @param int $sessionId The OAuth session ID * @param int $sessionId The OAuth session ID
* @return string|null Returns the access token as a string if * @return string|null Returns the access token as a string if
* found otherwise returns null * found otherwise returns null
@ -193,13 +205,13 @@ interface Database
/** /**
* Removes an authorisation code associated with a session * Removes an authorisation code associated with a session
* *
* Database query: * Database query:
* *
* <code> * <code>
* UPDATE oauth_sessions SET auth_code = NULL WHERE id = $sessionId * UPDATE oauth_sessions SET auth_code = NULL WHERE id = $sessionId
* </code> * </code>
* *
* @param int $sessionId The OAuth session ID * @param int $sessionId The OAuth session ID
* @return void * @return void
*/ */
@ -207,14 +219,14 @@ interface Database
/** /**
* Sets a sessions access token * Sets a sessions access token
* *
* Database query: * Database query:
* *
* <code> * <code>
* UPDATE oauth_sessions SET access_token = $accessToken WHERE id = * UPDATE oauth_sessions SET access_token = $accessToken WHERE id =
* $sessionId * $sessionId
* </code> * </code>
* *
* @param int $sessionId The OAuth session ID * @param int $sessionId The OAuth session ID
* @param string $accessToken The access token * @param string $accessToken The access token
* @return void * @return void
@ -226,14 +238,14 @@ interface Database
/** /**
* Associates a session with a scope * Associates a session with a scope
* *
* Database query: * Database query:
* *
* <code> * <code>
* INSERT INTO oauth_session_scopes (session_id, scope) VALUE ($sessionId, * INSERT INTO oauth_session_scopes (session_id, scope) VALUE ($sessionId,
* $scope) * $scope)
* </code> * </code>
* *
* @param int $sessionId The session ID * @param int $sessionId The session ID
* @param string $scope The scope * @param string $scope The scope
* @return void * @return void
@ -245,15 +257,15 @@ interface Database
/** /**
* Return information about a scope * Return information about a scope
* *
* Database query: * Database query:
* *
* <code> * <code>
* SELECT * FROM scopes WHERE scope = $scope * SELECT * FROM scopes WHERE scope = $scope
* </code> * </code>
* *
* Response: * Response:
* *
* <code> * <code>
* Array * Array
* ( * (
@ -263,22 +275,22 @@ interface Database
* [description] => (string) The scope's description * [description] => (string) The scope's description
* ) * )
* </code> * </code>
* *
* @param string $scope The scope * @param string $scope The scope
* @return array * @return array
*/ */
public function getScope($scope); public function getScope($scope);
/** /**
* Associate a session's scopes with an access token * Associate a session's scopes with an access token
* *
* Database query: * Database query:
* *
* <code> * <code>
* UPDATE oauth_session_scopes SET access_token = $accessToken WHERE * UPDATE oauth_session_scopes SET access_token = $accessToken WHERE
* session_id = $sessionId * session_id = $sessionId
* </code> * </code>
* *
* @param int $sessionId The session ID * @param int $sessionId The session ID
* @param string $accessToken The access token * @param string $accessToken The access token
* @return void * @return void
@ -290,17 +302,17 @@ interface Database
/** /**
* Return the scopes associated with an access token * Return the scopes associated with an access token
* *
* Database query: * Database query:
* *
* <code> * <code>
* SELECT scopes.scope, scopes.name, scopes.description FROM * SELECT scopes.scope, scopes.name, scopes.description FROM
* oauth_session_scopes JOIN scopes ON oauth_session_scopes.scope = * oauth_session_scopes JOIN scopes ON oauth_session_scopes.scope =
* scopes.scope WHERE access_token = $accessToken * scopes.scope WHERE access_token = $accessToken
* </code> * </code>
* *
* Response: * Response:
* *
* <code> * <code>
* Array * Array
* ( * (
@ -312,7 +324,7 @@ interface Database
* ) * )
* ) * )
* </code> * </code>
* *
* @param string $accessToken The access token * @param string $accessToken The access token
* @return array * @return array
*/ */

19
src/Oauth2/Client/Provider.php Executable file
View File

@ -0,0 +1,19 @@
<?php
namespace OAuth2\Client;
class Provider
{
private function __constuct() {}
public static function factory($name, array $options = null)
{
if ( ! class_exists($name)) {
throw new OAuth2\Client\Exception('There is no identity provider called: '.$name);
}
return new $name($options);
}
}

24
src/Oauth2/Resource/Database.php
View File

@ -6,17 +6,17 @@ interface Database
{ {
/** /**
* Validate an access token and return the session details. * Validate an access token and return the session details.
* *
* Database query: * Database query:
* *
* <code> * <code>
* SELECT id, owner_type, owner_id FROM oauth_sessions WHERE access_token = * SELECT id, owner_type, owner_id FROM oauth_sessions WHERE access_token =
* $accessToken AND stage = 'granted' AND * $accessToken AND stage = 'granted' AND
* access_token_expires > UNIX_TIMESTAMP(now()) * access_token_expires > UNIX_TIMESTAMP(now())
* </code> * </code>
* *
* Response: * Response:
* *
* <code> * <code>
* Array * Array
* ( * (
@ -25,7 +25,7 @@ interface Database
* [owner_id] => (string) The session owner's ID * [owner_id] => (string) The session owner's ID
* ) * )
* </code> * </code>
* *
* @param string $accessToken The access token * @param string $accessToken The access token
* @return array|bool Return an array on success or false on failure * @return array|bool Return an array on success or false on failure
*/ */
@ -33,16 +33,16 @@ interface Database
/** /**
* Returns the scopes that the session is authorised with. * Returns the scopes that the session is authorised with.
* *
* Database query: * Database query:
* *
* <code> * <code>
* SELECT scope FROM oauth_session_scopes WHERE access_token = * SELECT scope FROM oauth_session_scopes WHERE session_id =
* '291dca1c74900f5f252de351e0105aa3fc91b90b' * $sessionId
* </code> * </code>
* *
* Response: * Response:
* *
* <code> * <code>
* Array * Array
* ( * (
@ -51,7 +51,7 @@ interface Database
* ... * ...
* ) * )
* </code> * </code>
* *
* @param int $sessionId The session ID * @param int $sessionId The session ID
* @return array A list of scopes * @return array A list of scopes
*/ */

2
src/Oauth2/Resource/Server.php
View File

@ -75,7 +75,7 @@ class Server
public function __construct($options = null) public function __construct($options = null)
{ {
if ($options !== null) { if ($options !== null) {
$this->config = array_merge($this->config, $options); $this->_config = array_merge($this->_config, $options);
} }
} }

245
tests/authentication/database_mock.php
View File

@ -23,169 +23,132 @@ class OAuthdb implements Database
'description' => 'test' 'description' => 'test'
)); ));
public function validateClient( public function validateClient($clientId, $clientSecret = null, $redirectUri = null)
$clientId, {
$clientSecret = null, if ($clientId !== $this->clients[0]['client_id'])
$redirectUri = null {
) return false;
{ }
if ($clientId !== $this->clients[0]['client_id'])
{
return false;
}
if ($clientSecret !== null && $clientSecret !== $this->clients[0]['client_secret']) if ($clientSecret !== null && $clientSecret !== $this->clients[0]['client_secret'])
{ {
return false; return false;
} }
if ($redirectUri !== null && $redirectUri !== $this->clients[0]['redirect_uri']) if ($redirectUri !== null && $redirectUri !== $this->clients[0]['redirect_uri'])
{ {
return false; return false;
} }
return $this->clients[0]; return $this->clients[0];
} }
public function newSession( public function newSession($clientId, $redirectUri, $type = 'user', $typeId = null, $authCode = null, $accessToken = null, $accessTokenExpire = null, $stage = 'requested')
$clientId, {
$redirectUri, $id = count($this->sessions);
$type = 'user',
$typeId = null,
$authCode = null,
$accessToken = null,
$accessTokenExpire = null,
$stage = 'requested'
)
{
$id = count($this->sessions);
$this->sessions[$id] = array( $this->sessions[$id] = array(
'id' => $id, 'id' => $id,
'client_id' => $clientId, 'client_id' => $clientId,
'redirect_uri' => $redirectUri, 'redirect_uri' => $redirectUri,
'owner_type' => $type, 'owner_type' => $type,
'owner_id' => $typeId, 'owner_id' => $typeId,
'auth_code' => $authCode, 'auth_code' => $authCode,
'access_token' => $accessToken, 'access_token' => $accessToken,
'access_token_expire' => $accessTokenExpire, 'access_token_expire' => $accessTokenExpire,
'stage' => $stage 'stage' => $stage
); );
$this->sessions_client_type_id[$clientId . ':' . $type . ':' . $typeId] = $id; $this->sessions_client_type_id[$clientId . ':' . $type . ':' . $typeId] = $id;
$this->sessions_code[$clientId . ':' . $redirectUri . ':' . $authCode] = $id; $this->sessions_code[$clientId . ':' . $redirectUri . ':' . $authCode] = $id;
return true; return $id;
} }
public function updateSession( public function updateSession($sessionId, $authCode = null, $accessToken = null, $accessTokenExpire = null, $stage = 'requested')
$sessionId, {
$authCode = null, $this->sessions[$sessionId]['auth_code'] = $authCode;
$accessToken = null, $this->sessions[$sessionId]['access_token'] = $accessToken;
$accessTokenExpire = null, $this->sessions[$sessionId]['access_token_expire'] = $accessTokenExpire;
$stage = 'requested' $this->sessions[$sessionId]['stage'] = $stage;
)
{
$this->sessions[$sessionId]['auth_code'] = $authCode;
$this->sessions[$sessionId]['access_token'] = $accessToken;
$this->sessions[$sessionId]['access_token_expire'] = $accessTokenExpire;
$this->sessions[$sessionId]['stage'] = $stage;
return true; return true;
} }
public function deleteSession( public function deleteSession($clientId, $type, $typeId)
$clientId, {
$type, $key = $clientId . ':' . $type . ':' . $typeId;
$typeId if (isset($this->sessions_client_type_id[$key]))
) {
{ unset($this->sessions[$this->sessions_client_type_id[$key]]);
$key = $clientId . ':' . $type . ':' . $typeId; }
if (isset($this->sessions_client_type_id[$key])) return true;
{ }
unset($this->sessions[$this->sessions_client_type_id[$key]]);
}
return true;
}
public function validateAuthCode( public function validateAuthCode($clientId, $redirectUri, $authCode)
$clientId, {
$redirectUri, $key = $clientId . ':' . $redirectUri . ':' . $authCode;
$authCode
)
{
$key = $clientId . ':' . $redirectUri . ':' . $authCode;
if (isset($this->sessions_code[$key])) if (isset($this->sessions_code[$key]))
{ {
return $this->sessions[$this->sessions_code[$key]]; return $this->sessions[$this->sessions_code[$key]];
} }
return false; return false;
} }
public function hasSession( public function hasSession($type, $typeId, $clientId)
$type, {
$typeId, die('not implemented hasSession');
$clientId }
)
{
die('not implemented hasSession');
}
public function getAccessToken($sessionId) public function getAccessToken($sessionId)
{ {
die('not implemented getAccessToken'); die('not implemented getAccessToken');
} }
public function removeAuthCode($sessionId) public function removeAuthCode($sessionId)
{ {
die('not implemented removeAuthCode'); die('not implemented removeAuthCode');
} }
public function setAccessToken( public function setAccessToken(
$sessionId, $sessionId,
$accessToken $accessToken
) )
{ {
die('not implemented setAccessToken'); die('not implemented setAccessToken');
} }
public function addSessionScope( public function addSessionScope($sessionId, $scope)
$sessionId, {
$scope if ( ! isset($this->session_scopes[$sessionId]))
) {
{ $this->session_scopes[$sessionId] = array();
if ( ! isset($this->session_scopes[$sessionId])) }
{
$this->session_scopes[$sessionId] = array();
}
$this->session_scopes[$sessionId][] = $scope; $this->session_scopes[$sessionId][] = $scope;
return true; return true;
} }
public function getScope($scope) public function getScope($scope)
{ {
if ( ! isset($this->scopes[$scope])) if ( ! isset($this->scopes[$scope]))
{ {
return false; return false;
} }
return $this->scopes[$scope]; return $this->scopes[$scope];
} }
public function updateSessionScopeAccessToken( public function updateSessionScopeAccessToken($sessionId, $accessToken)
$sessionId, {
$accessToken return true;
) }
{
return true;
}
public function accessTokenScopes($accessToken) public function accessTokenScopes($accessToken)
{ {
die('not implemented accessTokenScopes'); die('not implemented accessTokenScopes');
} }
} }