X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FOwa.php;h=eaba8abd53025704c82cbe810bb94110e24a1b6a;hb=e198edf652479bd0a969b3aabb469361dba0fd6b;hp=7243c111344b4d159e5fa6d5a86b701936ecd241;hpb=8c6df8f156fe28431c17a9d8c3cdb2180005090e;p=friendica.git diff --git a/src/Module/Owa.php b/src/Module/Owa.php index 7243c11134..eaba8abd53 100644 --- a/src/Module/Owa.php +++ b/src/Module/Owa.php @@ -1,7 +1,24 @@ . + * */ + namespace Friendica\Module; use Friendica\BaseModule; @@ -14,7 +31,7 @@ use Friendica\Util\HTTPSignature; use Friendica\Util\Strings; /** - * @brief OpenWebAuth verifier and token generator + * OpenWebAuth verifier and token generator * * See https://macgirvin.com/wiki/mike/OpenWebAuth/Home * Requests to this endpoint should be signed using HTTP Signatures @@ -27,9 +44,8 @@ use Friendica\Util\Strings; */ class Owa extends BaseModule { - public static function init() + protected function rawContent(array $request = []) { - $ret = [ 'success' => false ]; foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) { @@ -59,8 +75,7 @@ class Owa extends BaseModule $verified = HTTPSignature::verifyMagic($contact['pubkey']); if ($verified && $verified['header_signed'] && $verified['header_valid']) { - Logger::log('OWA header: ' . print_r($verified, true), Logger::DATA); - Logger::log('OWA success: ' . $contact['addr'], Logger::DATA); + Logger::debug('OWA header', ['addr' => $contact['addr'], 'data' => $verified]); $ret['success'] = true; $token = Strings::getRandomHex(32); @@ -77,10 +92,10 @@ class Owa extends BaseModule openssl_public_encrypt($token, $result, $contact['pubkey']); $ret['encrypted_token'] = Strings::base64UrlEncode($result); } else { - Logger::log('OWA fail: ' . $contact['id'] . ' ' . $contact['addr'] . ' ' . $contact['url'], Logger::DEBUG); + Logger::info('OWA fail', ['id' => $contact['id'], 'addr' => $contact['addr'], 'url' => $contact['url']]); } } else { - Logger::log('Contact not found: ' . $handle, Logger::DEBUG); + Logger::info('Contact not found', ['handle' => $handle]); } } }