aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Authorize.php87
-rw-r--r--Zotlabs/Module/Oauth2testvehicle.php186
-rw-r--r--Zotlabs/Module/Token.php3
-rw-r--r--Zotlabs/Storage/ZotOauth2Pdo.php10
4 files changed, 265 insertions, 21 deletions
diff --git a/Zotlabs/Module/Authorize.php b/Zotlabs/Module/Authorize.php
index 254700b4e..f505b4681 100644
--- a/Zotlabs/Module/Authorize.php
+++ b/Zotlabs/Module/Authorize.php
@@ -4,15 +4,14 @@ namespace Zotlabs\Module;
use Zotlabs\Identity\OAuth2Storage;
-
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)) ;
- if(strlen($userpass)) {
+ $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6));
+ if (strlen($userpass)) {
list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name;
$_SERVER['PHP_AUTH_PW'] = $password;
@@ -20,43 +19,91 @@ class Authorize extends \Zotlabs\Web\Controller {
}
if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
- $userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ;
- if(strlen($userpass)) {
+ $userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6));
+ if (strlen($userpass)) {
list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name;
$_SERVER['PHP_AUTH_PW'] = $password;
}
}
+ }
+
+ function get() {
+ if (!local_channel()) {
+ return login();
+ } else {
+ // TODO: Fully implement the dynamic client registration protocol:
+ // OpenID Connect Dynamic Client Registration 1.0 Client Metadata
+ // http://openid.net/specs/openid-connect-registration-1_0.html
+ $app = array(
+ 'name' => (x($_REQUEST, 'client_name') ? urldecode($_REQUEST['client_name']) : 'Unknown App'),
+ 'icon' => (x($_REQUEST, 'logo_uri') ? urldecode($_REQUEST['logo_uri']) : '/images/icons/plugin.png'),
+ 'url' => (x($_REQUEST, 'client_uri') ? urldecode($_REQUEST['client_uri']) : ''),
+ );
+ $o .= replace_macros(get_markup_template('oauth_authorize.tpl'), array(
+ '$title' => '',
+ '$authorize' => 'Do you authorize the app <a style="float: none;" href="' . $app['url'] . '">' . $app['name'] . '</a> to access your channel data?',
+ '$app' => $app,
+ '$yes' => t('Allow'),
+ '$no' => t('Deny'),
+ '$client_id' => (x($_REQUEST, 'client_id') ? $_REQUEST['client_id'] : ''),
+ '$redirect_uri' => (x($_REQUEST, 'redirect_uri') ? $_REQUEST['redirect_uri'] : ''),
+ '$state' => (x($_REQUEST, 'state') ? $_REQUEST['state'] : ''),
+ ));
+ return $o;
+ }
+ }
+
+ function post() {
+ if (!local_channel()) {
+ return $this->get();
+ }
- $s = new \Zotlabs\Identity\OAuth2Server(new OAuth2Storage(\DBA::$dba->db));
+ $storage = new OAuth2Storage(\DBA::$dba->db);
+ $s = new \Zotlabs\Identity\OAuth2Server($storage);
+
+ // TODO: The automatic client registration protocol below should adhere more
+ // closely to "OAuth 2.0 Dynamic Client Registration Protocol" defined
+ // at https://tools.ietf.org/html/rfc7591
+
+ // If no client_id was provided, generate a new one.
+ if (x($_POST, 'client_id')) {
+ $client_id = $_POST['client_id'];
+ } else {
+ $client_id = $_POST['client_id'] = random_string(16);
+ }
+ // If no redirect_uri was provided, generate a fake one.
+ if (x($_POST, 'redirect_uri')) {
+ $redirect_uri = $_POST['redirect_uri'];
+ } else {
+ $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, 'authorization_code', null, $user_id);
+ $response->setParameter('client_secret', $client_secret);
+ }
+
// validate the authorize request
- if (! $s->validateAuthorizeRequest($request, $response)) {
+ if (!$s->validateAuthorizeRequest($request, $response)) {
$response->send();
killme();
}
- // display an authorization form
- if (empty($_POST)) {
-
- 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');
+ $is_authorized = ($_POST['authorize'] === 'allow');
$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);
+ $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40);
echo("SUCCESS! Authorization Code: $code");
}
diff --git a/Zotlabs/Module/Oauth2testvehicle.php b/Zotlabs/Module/Oauth2testvehicle.php
new file mode 100644
index 000000000..37a0b9b0e
--- /dev/null
+++ b/Zotlabs/Module/Oauth2testvehicle.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace Zotlabs\Module;
+
+class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
+
+ function init() {
+
+ // 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);
+ info('Authorization callback invoked.' . EOL);
+ return $this->get();
+ }
+ }
+ function get() {
+
+ $o .= replace_macros(get_markup_template('oauth2testvehicle.tpl'), array(
+ '$baseurl' => z_root(),
+ /*
+ endpoints => array(
+ array(
+ 'path_to_endpoint',
+ array(
+ array('field_name_1', 'value'),
+ array('field_name_2', 'value'),
+ ...
+ ),
+ 'submit_button_name',
+ 'Description of API action'
+ )
+ )
+ */
+ '$endpoints' => array(
+ array(
+ 'oauth2testvehicle',
+ array(
+ array(
+ 'action', 'delete_db'
+ )
+ ),
+ 'oauth2test_delete_db',
+ '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('killer_app')),
+ array('redirect_uri', 'http://hub.localhost/oauth2testvehicle'),
+ array('state', 'xyz'),
+ // OpenID Connect Dynamic Client Registration 1.0 Client Metadata
+ // http://openid.net/specs/openid-connect-registration-1_0.html
+ array('client_name', urlencode('Killer App')),
+ array('logo_uri', urlencode('https://client.example.com/website/img/icon.png')),
+ array('client_uri', urlencode('https://client.example.com/website')),
+ array('application_type', 'web'), // would be 'native' for mobile app
+ ),
+ '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'
+ )
+ )
+ ));
+
+ return $o;
+ }
+
+ function post() {
+
+ //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
+ // by passing it the database connection
+ $pdo = \DBA::$dba->db;
+ $storage = new \Zotlabs\Storage\ZotOauth2Pdo($pdo);
+ logger('Deleting existing database tables...', LOGGER_DEBUG);
+ foreach ($storage->getConfig() as $key => $table) {
+ logger('Deleting table ' . dbesc($table), LOGGER_DEBUG);
+ $r = q("DROP TABLE %s;", dbesc($table));
+ if (!$r) {
+ logger('Errors encountered deleting database table ' . $table . '.', LOGGER_DEBUG);
+ $status = false;
+ }
+ }
+ if (!$status) {
+ notice('Errors encountered deleting database tables.' . EOL);
+ } else {
+ info('Database tables deleted successfully.' . EOL);
+ }
+
+ break;
+
+ case 'create_db':
+ $status = true;
+ logger('Creating database tables...', LOGGER_DEBUG);
+ @include('.htconfig.php');
+ $pdo = \DBA::$dba->db;
+ $storage = new \Zotlabs\Storage\ZotOauth2Pdo($pdo);
+ foreach (explode(';', $storage->getBuildSql($db_data)) as $statement) {
+ try {
+ $result = $pdo->exec($statement);
+ } catch (\PDOException $e) {
+ $status = false;
+ logger('Error executing database statement: ' . $statement, LOGGER_DEBUG);
+ }
+ }
+
+ if (!$status) {
+ notice('Errors encountered creating database tables.' . EOL);
+ } else {
+ info('Database tables created successfully.' . EOL);
+ }
+
+ default:
+ break;
+ }
+ }
+
+}
diff --git a/Zotlabs/Module/Token.php b/Zotlabs/Module/Token.php
index f7c074233..32cf95c61 100644
--- a/Zotlabs/Module/Token.php
+++ b/Zotlabs/Module/Token.php
@@ -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();
}
diff --git a/Zotlabs/Storage/ZotOauth2Pdo.php b/Zotlabs/Storage/ZotOauth2Pdo.php
new file mode 100644
index 000000000..b2c3ce228
--- /dev/null
+++ b/Zotlabs/Storage/ZotOauth2Pdo.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Zotlabs\Storage;
+
+class ZotOauth2Pdo extends \OAuth2\Storage\Pdo {
+ public function getConfig()
+ {
+ return $this->config;
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 17:40:47 +0000