port hubzillas OpenWebAuth - rename some methods and classes

This commit is contained in:
rabuzarus 2018-06-20 18:38:23 +02:00
parent b65e4b278b
commit f0235c4a98
6 changed files with 9 additions and 12 deletions

View File

@ -362,7 +362,6 @@ Called when a magic-auth was successful.
Hook data:
'visitor' => array with the contact record of the visitor
'url' => the query string
'session' => $_SESSION array
Current JavaScript hooks
-------------

View File

@ -147,7 +147,7 @@ if ((x($_GET,'zrl')) && $a->mode == App::MODE_NORMAL) {
if ((x($_GET,'owt')) && $a->mode == App::MODE_NORMAL) {
$token = $_GET['owt'];
$a->query_string = Profile::stripQueryParam($a->query_string, 'owt');
Profile::owtInit($token);
Profile::openWebAuthInit($token);
}
/**

View File

@ -1052,7 +1052,7 @@ class Profile
*
* @param string $token
*/
public static function owtInit($token)
public static function openWebAuthInit($token)
{
$a = get_app();
@ -1084,19 +1084,17 @@ class Profile
$arr = [
'visitor' => $visitor,
'url' => $a->query_string,
'session' => $_SESSION
'url' => $a->query_string
];
/**
* @hooks magic_auth_success
* Called when a magic-auth was successful.
* * \e array \b visitor
* * \e string \b url
* * \e array \b session
*/
Addon::callHooks('magic_auth_success', $arr);
$a->contact = $visitor;
$a->contact = $arr['visitor'];
info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->get_hostname(), $visitor['name']));

View File

@ -6,7 +6,7 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Model\Contact;
use Friendica\Util\HTTPSig;
use Friendica\Util\HTTPSignature;
use Friendica\Util\Network;
use dba;
@ -76,7 +76,7 @@ class Magic extends BaseModule
$headers['X-Open-Web-Auth'] = random_string();
// Create a header that is signed with the local users private key.
$headers = HTTPSig::createSig(
$headers = HTTPSignature::createSig(
'',
$headers,
$user['prvkey'],

View File

@ -9,7 +9,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Verify;
use Friendica\Util\HTTPSig;
use Friendica\Util\HTTPSignature;
use dba;
@ -39,7 +39,7 @@ class Owa extends BaseModule
continue;
}
$sigblock = HTTPSig::parseSigheader($_SERVER[$head]);
$sigblock = HTTPSignature::parseSigheader($_SERVER[$head]);
if ($sigblock) {
$keyId = $sigblock['keyId'];

View File

@ -19,7 +19,7 @@ use dba;
* @see https://tools.ietf.org/html/draft-cavage-http-signatures-07
*/
class HTTPSig
class HTTPSignature
{
/**
* @brief RFC5843