harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

An authorization token is received, but I had to modify the Request class in vendor/bshaffer/oauth2-server-php/ to accept $_REQUEST instead of $_POST.

Browse Source
This commit is contained in:
Andrew Manning 2018-02-25 08:36:40 -05:00
parent 497ebca54f
commit 70b8f3240f
4 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Zotlabs/Module/Authorize.php
View File

@ -79,17 +79,18 @@ class Authorize extends \Zotlabs\Web\Controller {
$redirect_uri = $_POST['redirect_uri'] = 'https://fake.example.com';
}
$request = \OAuth2\Request::createFromGlobals();
$response = new \OAuth2\Response();
// If the client is not registered, add to the database
if (!$storage->getClientDetails($client_id)) {
$client_secret = random_string(16);
// Client apps are registered per channel
$user_id = local_channel();
$storage->setClientDetails($client_id, $client_secret, $redirect_uri, null, null, $user_id);
$storage->setClientDetails($client_id, $client_secret, $redirect_uri, 'authorization_code', null, $user_id);
$response->setParameter('client_secret', $client_secret);
}
$request = \OAuth2\Request::createFromGlobals();
$response = new \OAuth2\Response();
// validate the authorize request
if (!$s->validateAuthorizeRequest($request, $response)) {
$response->send();

76
Zotlabs/Module/Oauth2testvehicle.php
View File

@ -9,6 +9,11 @@ class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
// If there is a 'code' and 'state' parameter then this is a client app
// callback issued after the authorization code request
// TODO: Check state value and compare to original sent value
// "You should first compare this state value to ensure it matches the
// one you started with. You can typically store the state value in a
// cookie, and compare it when the user comes back. This ensures your
// redirection endpoint isn't able to be tricked into attempting to
// exchange arbitrary authorization codes."
if ($_REQUEST['code'] && $_REQUEST['state']) {
logger('Authorization callback invoked.', LOGGER_DEBUG);
logger(json_encode($_REQUEST, JSON_PRETTY_PRINT), LOGGER_DEBUG);
@ -35,17 +40,6 @@ class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
)
*/
'$endpoints' => array(
array(
'oauth2testvehicle',
array(
array(
'action', 'create_db'
)
),
'oauth2test_create_db',
'Create the OAuth2 database tables',
'POST'
),
array(
'oauth2testvehicle',
array(
@ -57,11 +51,22 @@ class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
'Delete the OAuth2 database tables',
'POST'
),
array(
'oauth2testvehicle',
array(
array(
'action', 'create_db'
)
),
'oauth2test_create_db',
'Create the OAuth2 database tables',
'POST'
),
array(
'authorize',
array(
array('response_type', 'code'),
array('client_id', urlencode('test_app_client_id')),
array('client_id', urlencode('killer_app')),
array('redirect_uri', 'http://hub.localhost/oauth2testvehicle'),
array('state', 'xyz'),
// OpenID Connect Dynamic Client Registration 1.0 Client Metadata
@ -74,6 +79,27 @@ class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
'oauth_authorize',
'Authorize a test client app',
'GET'
),
/*
* POST https://api.authorization-server.com/token
grant_type=authorization_code&
code=AUTH_CODE_HERE&
redirect_uri=REDIRECT_URI&
client_id=CLIENT_ID
*/
array(
'oauth2testvehicle',
array(
array('action', 'request_token'),
array('grant_type', 'authorization_code'),
array('code', (x($_REQUEST, 'code') ? $_REQUEST['code'] : 'no_authorization_code')),
array('redirect_uri', 'http://hub.localhost/oauth2testvehicle'),
array('client_id', urlencode('killer_app')),
array('client_secret', (x($_REQUEST, 'client_secret') ? $_REQUEST['client_secret'] : 'no_client_secret')),
),
'oauth_token_request',
'Request a token',
'POST'
)
)
));
@ -83,11 +109,31 @@ class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
function post() {
logger(json_encode($_POST), LOGGER_DEBUG);
//logger(json_encode($_POST, JSON_PRETTY_PRINT), LOGGER_DEBUG);
switch ($_POST['action']) {
case 'request_token':
$grant_type = (x($_POST, 'grant_type') ? $_POST['grant_type'] : '');
$redirect_uri = (x($_POST, 'redirect_uri') ? $_POST['redirect_uri'] : '');
$client_id = (x($_POST, 'client_id') ? $_POST['client_id'] : '');
$code = (x($_POST, 'code') ? $_POST['code'] : '');
$client_secret = (x($_POST, 'client_secret') ? $_POST['client_secret'] : '');
$url = z_root() . '/token/?';
$url .= 'grant_type=' . urlencode($grant_type);
$url .= '&redirect_uri=' . urlencode($redirect_uri);
$url .= '&client_id=' . urlencode($client_id);
$url .= '&code=' . urlencode($code);
$post = z_fetch_url($url, false, 0, array(
'custom' => 'POST',
'http_auth' => $client_id . ':' . $client_secret,
));
//logger(json_encode($post, JSON_PRETTY_PRINT), LOGGER_DEBUG);
$response = json_decode($post['body'], true);
logger(json_encode($response, JSON_PRETTY_PRINT), LOGGER_DEBUG);
if($response['access_token']) {
info('Access token received: ' . $response['access_token'] . EOL);
}
break;
case 'delete_db':
$status = true;
// Use the \OAuth2\Storage\Pdo class to create the OAuth2 tables

3
Zotlabs/Module/Token.php
View File

@ -29,7 +29,8 @@ class Token extends \Zotlabs\Web\Controller {
}
$s = new \Zotlabs\Identity\OAuth2Server(new OAuth2Storage(\DBA::$dba->db));
$s->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send();
$request = \OAuth2\Request::createFromGlobals();
$s->handleTokenRequest($request)->send();
killme();
}

2
vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php vendored
View File

@ -226,7 +226,7 @@ class Request implements RequestInterface
$class = get_called_class();
/** @var Request $request */
$request = new $class($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
$request = new $class($_GET, $_REQUEST, array(), $_COOKIE, $_FILES, $_SERVER);
$contentType = $request->server('CONTENT_TYPE', '');
$requestMethod = $request->server('REQUEST_METHOD', 'GET');