namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\Core\Logger;
use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\OpenWebAuthToken;
use Friendica\Util\HTTPSignature;
-use dba;
-
/**
* @brief OpenWebAuth verifier and token generator
- *
+ *
* See https://macgirvin.com/wiki/mike/OpenWebAuth/Home
* Requests to this endpoint should be signed using HTTP Signatures
* using the 'Authorization: Signature' authentication method
* If the signature verifies a token is returned.
*
* This token may be exchanged for an authenticated cookie.
- *
+ *
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Module/Owa.php
*/
class Owa extends BaseModule
$fields = ['id', 'url', 'addr', 'pubkey'];
$condition = ['id' => $cid];
- $contact = dba::selectFirst('contact', $fields, $condition);
+ $contact = DBA::selectFirst('contact', $fields, $condition);
- if (DBM::is_result($contact)) {
+ if (DBA::isResult($contact)) {
// Try to verify the signed header with the public key of the contact record
// we have found.
- $verified = HTTPSig::verify('', $contact['pubkey']);
+ $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);
openssl_public_encrypt($token, $result, $contact['pubkey']);
$ret['encrypted_token'] = base64url_encode($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);
}
}
}