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

Merge pull request #980 from dawnbreak/dev

Browse Source 
Refactor OAuth2Server a bit.
This commit is contained in:
git-marijus
2018-02-19 11:11:08 +01:00
committed by GitHub
parent 1732ffed7a 4a5d1076ed
commit b56633e1d6
3 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Zotlabs/Identity/OAuth2Server.php
View File

@@ -2,42 +2,33 @@
namespace Zotlabs\Identity; namespace Zotlabs\Identity;
class OAuth2Server { class OAuth2Server extends \OAuth2\Server {
public $server; public function __construct(OAuth2Storage $storage, $config = []) {
public function __construct() {
$storage = new OAuth2Storage(\DBA::$dba->db);
if(! is_array($config)) {
$config = [ $config = [
'use_openid_connect' => true, 'use_openid_connect' => true,
'issuer' => \Zotlabs\Lib\System::get_site_name() 'issuer' => \Zotlabs\Lib\System::get_site_name()
]; ];
}
// Pass a storage object or array of storage objects to the OAuth2 server class parent::__construct($storage, $config);
$this->server = new \OAuth2\Server($storage,$config);
// Add the "Client Credentials" grant type (it is the simplest of the grant types) // Add the "Client Credentials" grant type (it is the simplest of the grant types)
$this->server->addGrantType(new \OAuth2\GrantType\ClientCredentials($storage)); $this->addGrantType(new \OAuth2\GrantType\ClientCredentials($storage));
// Add the "Authorization Code" grant type (this is where the oauth magic happens) // Add the "Authorization Code" grant type (this is where the oauth magic happens)
$this->server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($storage)); $this->addGrantType(new \OAuth2\GrantType\AuthorizationCode($storage));
$keyStorage = new \OAuth2\Storage\Memory( [ $keyStorage = new \OAuth2\Storage\Memory( [
'keys' => [ 'keys' => [
'public_key' => get_config('system','pubkey'), 'public_key' => get_config('system', 'pubkey'),
'private_key' => get_config('system','prvkey') 'private_key' => get_config('system', 'prvkey')
] ]
]); ]);
$this->server->addStorage($keyStorage,'public_key'); $this->addStorage($keyStorage, 'public_key');
} }
public function get_server() {
return $this->server;
}
} }

11
Zotlabs/Module/Authorize.php
View File

@@ -2,13 +2,13 @@
namespace Zotlabs\Module; namespace Zotlabs\Module;
use Zotlabs\Identity\OAuth2Storage;
class Authorize extends \Zotlabs\Web\Controller { class Authorize extends \Zotlabs\Web\Controller {
function init() { function init() {
// workaround for HTTP-auth in CGI mode // workaround for HTTP-auth in CGI mode
if (x($_SERVER, 'REDIRECT_REMOTE_USER')) { if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ; $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
@@ -28,13 +28,13 @@ class Authorize extends \Zotlabs\Web\Controller {
} }
} }
$s = new \Zotlabs\Identity\OAuth2Server(); $s = new \Zotlabs\Identity\OAuth2Server(new OAuth2Storage(\DBA::$dba->db));
$request = \OAuth2\Request::createFromGlobals(); $request = \OAuth2\Request::createFromGlobals();
$response = new \OAuth2\Response(); $response = new \OAuth2\Response();
// validate the authorize request // validate the authorize request
if (! $s->server->validateAuthorizeRequest($request, $response)) { if (! $s->validateAuthorizeRequest($request, $response)) {
$response->send(); $response->send();
killme(); killme();
} }
@@ -52,13 +52,12 @@ class Authorize extends \Zotlabs\Web\Controller {
// print the authorization code if the user has authorized your client // print the authorization code if the user has authorized your client
$is_authorized = ($_POST['authorized'] === 'yes'); $is_authorized = ($_POST['authorized'] === 'yes');
$s->server->handleAuthorizeRequest($request, $response, $is_authorized, local_channel()); $s->handleAuthorizeRequest($request, $response, $is_authorized, local_channel());
if ($is_authorized) { if ($is_authorized) {
// this is only here so that you get to see your code in the cURL request. Otherwise, // this is only here so that you get to see your code in the cURL request. Otherwise,
// we'd redirect back to the client // we'd redirect back to the client
$code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40); $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
echo("SUCCESS! Authorization Code: $code"); echo("SUCCESS! Authorization Code: $code");
} }
$response->send(); $response->send();

7
Zotlabs/Module/Token.php
View File

@@ -2,6 +2,8 @@
namespace Zotlabs\Module; namespace Zotlabs\Module;
use Zotlabs\Identity\OAuth2Storage;
class Token extends \Zotlabs\Web\Controller { class Token extends \Zotlabs\Web\Controller {
@@ -26,9 +28,8 @@ class Token extends \Zotlabs\Web\Controller {
} }
} }
$s = new \Zotlabs\Identity\OAuth2Server(new OAuth2Storage(\DBA::$dba->db));
$s = new \Zotlabs\Identity\OAuth2Server(); $s->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send();
$s->server->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send();
killme(); killme();
} }