Merge pull request #6905 from annando/ap-summary-text

[friendica.git] / src / Util / LDSignature.php

diff --git a/src/Util/LDSignature.php b/src/Util/LDSignature.php
index 51235204fcc4f2f5b5a9b8f8c11ee6d35951c621..9762b837f3bca737269d4ca87f78d95d5f45f855 100644 (file)
--- a/src/Util/LDSignature.php
+++ b/src/Util/LDSignature.php
@@ -2,9 +2,7 @@
 
 namespace Friendica\Util;
 
-use Friendica\Util\JsonLD;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Protocol\ActivityPub;
+use Friendica\Core\Logger;
 use Friendica\Model\APContact;
 
 /**
@@ -26,21 +24,21 @@ class LDSignature
                }
 
                $actor = JsonLD::fetchElement($data, 'actor', 'id');
-               if (empty($actor)) {
+               if (empty($actor) || !is_string($actor)) {
                        return false;
                }
 
-               $profile = APContact::getProfileByURL($actor);
+               $profile = APContact::getByURL($actor);
                if (empty($profile['pubkey'])) {
                        return false;
                }
                $pubkey = $profile['pubkey'];
 
-               $ohash = self::hash(self::signable_options($data['signature']));
-               $dhash = self::hash(self::signable_data($data));
+               $ohash = self::hash(self::signableOptions($data['signature']));
+               $dhash = self::hash(self::signableData($data));
 
                $x = Crypto::rsaVerify($ohash . $dhash, base64_decode($data['signature']['signatureValue']), $pubkey);
-               logger('LD-verify: ' . intval($x));
+               Logger::log('LD-verify: ' . intval($x));
 
                if (empty($x)) {
                        return false;
@@ -53,25 +51,25 @@ class LDSignature
        {
                $options = [
                        'type' => 'RsaSignature2017',
-                       'nonce' => random_string(64),
+                       'nonce' => Strings::getRandomHex(64),
                        'creator' => $owner['url'] . '#main-key',
                        'created' => DateTimeFormat::utcNow(DateTimeFormat::ATOM)
                ];
 
-               $ohash = self::hash(self::signable_options($options));
-               $dhash = self::hash(self::signable_data($data));
+               $ohash = self::hash(self::signableOptions($options));
+               $dhash = self::hash(self::signableData($data));
                $options['signatureValue'] = base64_encode(Crypto::rsaSign($ohash . $dhash, $owner['uprvkey']));
 
                return array_merge($data, ['signature' => $options]);
        }
 
-       private static function signable_data($data)
+       private static function signableData($data)
        {
                unset($data['signature']);
                return $data;
        }
 
-       private static function signable_options($options)
+       private static function signableOptions($options)
        {
                $newopts = ['@context' => 'https://w3id.org/identity/v1'];