aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2018-02-19 11:11:08 +0100
committerGitHub <noreply@github.com>2018-02-19 11:11:08 +0100
commitb56633e1d6d36de4a65ef07f9ee64a9e98a79c2b (patch)
treec95ee004310142f222289e3ef8b52552e1c0a083
parent1732ffed7a3a9c1ab8811baef3a36f70a64bce7a (diff)
parent4a5d1076eda66f4d562219468b84dff2bd8de86b (diff)
downloadvolse-hubzilla-b56633e1d6d36de4a65ef07f9ee64a9e98a79c2b.tar.gz
volse-hubzilla-b56633e1d6d36de4a65ef07f9ee64a9e98a79c2b.tar.bz2
volse-hubzilla-b56633e1d6d36de4a65ef07f9ee64a9e98a79c2b.zip
Merge pull request #980 from dawnbreak/dev
Refactor OAuth2Server a bit.
-rw-r--r--Zotlabs/Identity/OAuth2Server.php43
-rw-r--r--Zotlabs/Module/Authorize.php45
-rw-r--r--Zotlabs/Module/Token.php9
3 files changed, 44 insertions, 53 deletions
diff --git a/Zotlabs/Identity/OAuth2Server.php b/Zotlabs/Identity/OAuth2Server.php
index 3d7d5efb2..cbb4748fe 100644
--- a/Zotlabs/Identity/OAuth2Server.php
+++ b/Zotlabs/Identity/OAuth2Server.php
@@ -2,42 +2,33 @@
namespace Zotlabs\Identity;
-class OAuth2Server {
+class OAuth2Server extends \OAuth2\Server {
- public $server;
+ public function __construct(OAuth2Storage $storage, $config = []) {
- public function __construct() {
+ if(! is_array($config)) {
+ $config = [
+ 'use_openid_connect' => true,
+ 'issuer' => \Zotlabs\Lib\System::get_site_name()
+ ];
+ }
- $storage = new OAuth2Storage(\DBA::$dba->db);
-
- $config = [
- 'use_openid_connect' => true,
- 'issuer' => \Zotlabs\Lib\System::get_site_name()
- ];
-
- // Pass a storage object or array of storage objects to the OAuth2 server class
- $this->server = new \OAuth2\Server($storage,$config);
+ parent::__construct($storage, $config);
// 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)
- $this->server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($storage));
+ $this->addGrantType(new \OAuth2\GrantType\AuthorizationCode($storage));
- $keyStorage = new \OAuth2\Storage\Memory( [
- 'keys' => [
- 'public_key' => get_config('system','pubkey'),
- 'private_key' => get_config('system','prvkey')
+ $keyStorage = new \OAuth2\Storage\Memory( [
+ 'keys' => [
+ 'public_key' => get_config('system', 'pubkey'),
+ 'private_key' => get_config('system', 'prvkey')
]
]);
- $this->server->addStorage($keyStorage,'public_key');
-
+ $this->addStorage($keyStorage, 'public_key');
}
- public function get_server() {
- return $this->server;
- }
-
-
-} \ No newline at end of file
+}
diff --git a/Zotlabs/Module/Authorize.php b/Zotlabs/Module/Authorize.php
index 7676b0855..254700b4e 100644
--- a/Zotlabs/Module/Authorize.php
+++ b/Zotlabs/Module/Authorize.php
@@ -2,13 +2,13 @@
namespace Zotlabs\Module;
+use Zotlabs\Identity\OAuth2Storage;
-class Authorize extends \Zotlabs\Web\Controller {
+class Authorize extends \Zotlabs\Web\Controller {
function init() {
-
// workaround for HTTP-auth in CGI mode
if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
@@ -28,41 +28,40 @@ 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();
$response = new \OAuth2\Response();
// validate the authorize request
- if (! $s->server->validateAuthorizeRequest($request, $response)) {
- $response->send();
- killme();
+ if (! $s->validateAuthorizeRequest($request, $response)) {
+ $response->send();
+ killme();
}
- // display an authorization form
- if (empty($_POST)) {
+ // display an authorization form
+ if (empty($_POST)) {
- return '
+ return '
<form method="post">
<label>Do You Authorize TestClient?</label><br />
<input type="submit" name="authorized" value="yes">
<input type="submit" name="authorized" value="no">
</form>';
- }
+ }
- // print the authorization code if the user has authorized your client
- $is_authorized = ($_POST['authorized'] === 'yes');
- $s->server->handleAuthorizeRequest($request, $response, $is_authorized, local_channel());
- if ($is_authorized) {
- // this is only here so that you get to see your code in the cURL request. Otherwise,
- // we'd redirect back to the client
- $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
- echo("SUCCESS! Authorization Code: $code");
-
- }
+ // print the authorization code if the user has authorized your client
+ $is_authorized = ($_POST['authorized'] === 'yes');
+ $s->handleAuthorizeRequest($request, $response, $is_authorized, local_channel());
+ if ($is_authorized) {
+ // this is only here so that you get to see your code in the cURL request. Otherwise,
+ // we'd redirect back to the client
+ $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
+ echo("SUCCESS! Authorization Code: $code");
+ }
- $response->send();
- killme();
+ $response->send();
+ killme();
}
-} \ No newline at end of file
+}
diff --git a/Zotlabs/Module/Token.php b/Zotlabs/Module/Token.php
index 5cde58895..f7c074233 100644
--- a/Zotlabs/Module/Token.php
+++ b/Zotlabs/Module/Token.php
@@ -2,6 +2,8 @@
namespace Zotlabs\Module;
+use Zotlabs\Identity\OAuth2Storage;
+
class Token extends \Zotlabs\Web\Controller {
@@ -26,11 +28,10 @@ class Token extends \Zotlabs\Web\Controller {
}
}
-
- $s = new \Zotlabs\Identity\OAuth2Server();
- $s->server->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send();
+ $s = new \Zotlabs\Identity\OAuth2Server(new OAuth2Storage(\DBA::$dba->db));
+ $s->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send();
killme();
}
-} \ No newline at end of file
+}