UUID instead of GUID

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

diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index 6c580704f74dc06f6059e5f7b587641c1c458fc4..68f31c59de23aab272d19b7a17b1254c259affeb 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\Verify;
-use Friendica\Util\HTTPSig;
-
-use dba;
+use Friendica\Model\OpenWebAuthToken;
+use Friendica\Util\HTTPSignature;
 
 /**
  * @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
@@ -39,7 +37,7 @@ class Owa extends BaseModule
                                        continue;
                                }
 
-                               $sigblock = HTTPSig::parseSigheader($_SERVER[$head]);
+                               $sigblock = HTTPSignature::parseSigheader($_SERVER[$head]);
                                if ($sigblock) {
                                        $keyId = $sigblock['keyId'];
 
@@ -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);
@@ -66,7 +64,7 @@ class Owa extends BaseModule
                                                                $token = random_string(32);
 
                                                                // Store the generated token in the databe.
-                                                               Verify::create('owt', 0, $token, $contact['addr']);
+                                                               OpenWebAuthToken::create('owt', 0, $token, $contact['addr']);
 
                                                                $result = '';