Merge remote-tracking branch 'mike/master' into dev
This commit is contained in:
commit
547ef772ab
43
Zotlabs/Identity/OAuth2Server.php
Normal file
43
Zotlabs/Identity/OAuth2Server.php
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Zotlabs\Identity;
|
||||||
|
|
||||||
|
class OAuth2Server {
|
||||||
|
|
||||||
|
public $server;
|
||||||
|
|
||||||
|
public function __construct() {
|
||||||
|
|
||||||
|
$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);
|
||||||
|
|
||||||
|
// Add the "Client Credentials" grant type (it is the simplest of the grant types)
|
||||||
|
$this->server->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));
|
||||||
|
|
||||||
|
$keyStorage = new \OAuth2\Storage\Memory( [
|
||||||
|
'keys' => [
|
||||||
|
'public_key' => get_config('system','pubkey'),
|
||||||
|
'private_key' => get_config('system','prvkey')
|
||||||
|
]
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->server->addStorage($keyStorage,'public_key');
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function get_server() {
|
||||||
|
return $this->server;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
81
Zotlabs/Identity/OAuth2Storage.php
Normal file
81
Zotlabs/Identity/OAuth2Storage.php
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Zotlabs\Identity;
|
||||||
|
|
||||||
|
|
||||||
|
class OAuth2Storage extends \OAuth2\Storage\Pdo {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $username
|
||||||
|
* @param string $password
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function checkUserCredentials($username, $password)
|
||||||
|
{
|
||||||
|
if ($user = $this->getUser($username)) {
|
||||||
|
return $this->checkPassword($user, $password);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $username
|
||||||
|
* @return array|bool
|
||||||
|
*/
|
||||||
|
public function getUserDetails($username)
|
||||||
|
{
|
||||||
|
return $this->getUser($username);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param array $user
|
||||||
|
* @param string $password
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function checkPassword($user, $password)
|
||||||
|
{
|
||||||
|
|
||||||
|
$x = account_verify_password($user,$password);
|
||||||
|
return((array_key_exists('channel',$x) && ! empty($x['channel'])) ? true : false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $username
|
||||||
|
* @return array|bool
|
||||||
|
*/
|
||||||
|
public function getUser($username)
|
||||||
|
{
|
||||||
|
|
||||||
|
$x = channelx_by_nick($username);
|
||||||
|
if(! $x) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return( [
|
||||||
|
'username' => $x['channel_address'],
|
||||||
|
'user_id' => $x['channel_id'],
|
||||||
|
'firstName' => $x['channel_name'],
|
||||||
|
'lastName' => '',
|
||||||
|
'password' => 'NotARealPassword'
|
||||||
|
] );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* plaintext passwords are bad! Override this for your application
|
||||||
|
*
|
||||||
|
* @param string $username
|
||||||
|
* @param string $password
|
||||||
|
* @param string $firstName
|
||||||
|
* @param string $lastName
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function setUser($username, $password, $firstName = null, $lastName = null)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -6,7 +6,7 @@ namespace Zotlabs\Module;
|
|||||||
class Authorize extends \Zotlabs\Web\Controller {
|
class Authorize extends \Zotlabs\Web\Controller {
|
||||||
|
|
||||||
|
|
||||||
function get() {
|
function init() {
|
||||||
|
|
||||||
|
|
||||||
// workaround for HTTP-auth in CGI mode
|
// workaround for HTTP-auth in CGI mode
|
||||||
@ -28,16 +28,13 @@ class Authorize extends \Zotlabs\Web\Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$s = new \Zotlabs\Identity\OAuth2Server();
|
||||||
|
|
||||||
|
|
||||||
require_once('include/oauth2.php');
|
|
||||||
|
|
||||||
$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 (! $oauth2_server->validateAuthorizeRequest($request, $response)) {
|
if (! $s->server->validateAuthorizeRequest($request, $response)) {
|
||||||
$response->send();
|
$response->send();
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
@ -55,7 +52,7 @@ 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');
|
||||||
$oauth2_server->handleAuthorizeRequest($request, $response, $is_authorized);
|
$s->server->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
|
||||||
|
@ -5,9 +5,7 @@ namespace Zotlabs\Module;
|
|||||||
|
|
||||||
class Token extends \Zotlabs\Web\Controller {
|
class Token extends \Zotlabs\Web\Controller {
|
||||||
|
|
||||||
|
function init() {
|
||||||
function get() {
|
|
||||||
|
|
||||||
|
|
||||||
// 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')) {
|
||||||
@ -29,10 +27,8 @@ class Token extends \Zotlabs\Web\Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$s = new \Zotlabs\Identity\OAuth2Server();
|
||||||
|
$s->server->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send();
|
||||||
require_once('include/oauth2.php');
|
|
||||||
$oauth2_server->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send();
|
|
||||||
|
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user