bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

port hubzillas OpenWebAuth - rename some methods and classes

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Addons.md
View file

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

2
index.php
View file

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

8
src/Model/Profile.php
View file

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

4
src/Module/Magic.php
View file

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

4
src/Module/Owa.php
View file

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

2
src/Util/HTTPSig.php → src/Util/HTTPSignature.php
View file

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