Fixed max value check, improved request value fetching

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

diff --git a/src/Util/LDSignature.php b/src/Util/LDSignature.php
index 7776ec96c26f320b8c4cb8f4b217c3b0cf11e088..b5a55ea3596f8b43dcaebca876c45bf028a30fa3 100644 (file)
--- a/src/Util/LDSignature.php
+++ b/src/Util/LDSignature.php
@@ -1,14 +1,31 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Util;
 
-use Friendica\Util\JsonLD;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Protocol\ActivityPub;
+use Friendica\Core\Logger;
 use Friendica\Model\APContact;
 
 /**
- * @brief Implements JSON-LD signatures
+ * Implements JSON-LD signatures
  *
  * Ported from Osada: https://framagit.org/macgirvin/osada
  */
@@ -26,7 +43,7 @@ class LDSignature
                }
 
                $actor = JsonLD::fetchElement($data, 'actor', 'id');
-               if (empty($actor)) {
+               if (empty($actor) || !is_string($actor)) {
                        return false;
                }
 
@@ -40,7 +57,7 @@ class LDSignature
                $dhash = self::hash(self::signableData($data));
 
                $x = Crypto::rsaVerify($ohash . $dhash, base64_decode($data['signature']['signatureValue']), $pubkey);
-               logger('LD-verify: ' . intval($x));
+               Logger::notice('LD-verify', ['verified' => (int)$x, 'actor' => $profile['url']]);
 
                if (empty($x)) {
                        return false;
@@ -53,7 +70,7 @@ class LDSignature
        {
                $options = [
                        'type' => 'RsaSignature2017',
-                       'nonce' => random_string(64),
+                       'nonce' => Strings::getRandomHex(64),
                        'creator' => $owner['url'] . '#main-key',
                        'created' => DateTimeFormat::utcNow(DateTimeFormat::ATOM)
                ];