X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FOwa.php;h=7243c111344b4d159e5fa6d5a86b701936ecd241;hb=be3d7759f029a3000909dd0309fd914e0f70bf04;hp=13594a3ea02b62baa52ec2ec5ffedfd9294afb36;hpb=f0235c4a98e3f75afe6f4eb23b12d3b9a1c150ae;p=friendica.git

diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index 13594a3ea0..7243c11134 100644
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -5,24 +5,24 @@
 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\Verify;
+use Friendica\Model\OpenWebAuthToken;
 use Friendica\Util\HTTPSignature;
-
-use dba;
+use Friendica\Util\Strings;
 
 /**
  * @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,22 +51,22 @@ 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);
+								$token = Strings::getRandomHex(32);
 
 								// Store the generated token in the databe.
-								Verify::create('owt', 0, $token, $contact['addr']);
+								OpenWebAuthToken::create('owt', 0, $token, $contact['addr']);
 
 								$result = '';
 
@@ -75,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');
 	}
 }