X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FLDSignature.php;h=b5a55ea3596f8b43dcaebca876c45bf028a30fa3;hb=311c1fdd81b24c1a9afd70a8213d4b79b118e0d2;hp=ebbffeb1e8b1f0bb34dd88d674f3752cf344bfc0;hpb=c4994626e924d1e8d4767fbb371e2735e30e413d;p=friendica.git diff --git a/src/Util/LDSignature.php b/src/Util/LDSignature.php index ebbffeb1e8..b5a55ea359 100644 --- a/src/Util/LDSignature.php +++ b/src/Util/LDSignature.php @@ -1,14 +1,31 @@ . + * + */ 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,11 +43,11 @@ 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; } @@ -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) ];