X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FOwa.php;h=7243c111344b4d159e5fa6d5a86b701936ecd241;hb=774d04cd2fbdfaa36beb74b8a38b025c96184ff9;hp=7a5fe128c8424cea51c99de816e95dfae501a01b;hpb=406b46b63531bb45d73eda3badc7ba657c1ab8c0;p=friendica.git diff --git a/src/Module/Owa.php b/src/Module/Owa.php index 7a5fe128c8..7243c11134 100644 --- a/src/Module/Owa.php +++ b/src/Module/Owa.php @@ -5,11 +5,13 @@ namespace Friendica\Module; use Friendica\BaseModule; +use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\OpenWebAuthToken; use Friendica\Util\HTTPSignature; +use Friendica\Util\Strings; /** * @brief OpenWebAuth verifier and token generator @@ -57,11 +59,11 @@ class Owa extends BaseModule $verified = HTTPSignature::verifyMagic($contact['pubkey']); if ($verified && $verified['header_signed'] && $verified['header_valid']) { - logger('OWA header: ' . print_r($verified, true), LOGGER_DATA); - logger('OWA success: ' . $contact['addr'], LOGGER_DATA); + Logger::log('OWA header: ' . print_r($verified, true), Logger::DATA); + Logger::log('OWA success: ' . $contact['addr'], Logger::DATA); $ret['success'] = true; - $token = random_string(32); + $token = Strings::getRandomHex(32); // Store the generated token in the databe. OpenWebAuthToken::create('owt', 0, $token, $contact['addr']); @@ -73,17 +75,17 @@ class Owa extends BaseModule // At a later time, we will compare weather the token we're getting // is really the same token we have stored in the database. openssl_public_encrypt($token, $result, $contact['pubkey']); - $ret['encrypted_token'] = base64url_encode($result); + $ret['encrypted_token'] = Strings::base64UrlEncode($result); } else { - logger('OWA fail: ' . $contact['id'] . ' ' . $contact['addr'] . ' ' . $contact['url'], LOGGER_DEBUG); + Logger::log('OWA fail: ' . $contact['id'] . ' ' . $contact['addr'] . ' ' . $contact['url'], Logger::DEBUG); } } else { - logger('Contact not found: ' . $handle, LOGGER_DEBUG); + Logger::log('Contact not found: ' . $handle, Logger::DEBUG); } } } } } - System::jsonExit($ret, 'application/x-dfrn+json'); + System::jsonExit($ret, 'application/x-zot+json'); } }