Merge pull request #5907 from nupplaphil/goaway_to_redirectto

[friendica.git] / src / Module / Owa.php

diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index c1948f3b648a0e4d2fcebb7f374f12920ec4bad3..7a5fe128c8424cea51c99de816e95dfae501a01b 100644 (file)
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -6,23 +6,21 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 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
@@ -51,12 +49,12 @@ 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);