X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FLDSignature.php;h=b5a55ea3596f8b43dcaebca876c45bf028a30fa3;hb=720a43461d67ab229de0aecfc5008f22cc4c1c54;hp=e53590cf312cc2da5852bfe1bb473415ba3d6261;hpb=c6ce9ddaa41a59496cbe5cd93ace9bc552478ccd;p=friendica.git diff --git a/src/Util/LDSignature.php b/src/Util/LDSignature.php index e53590cf31..b5a55ea359 100644 --- a/src/Util/LDSignature.php +++ b/src/Util/LDSignature.php @@ -1,15 +1,31 @@ . + * + */ namespace Friendica\Util; use Friendica\Core\Logger; -use Friendica\Util\JsonLD; -use Friendica\Util\DateTimeFormat; -use Friendica\Protocol\ActivityPub; use Friendica\Model\APContact; /** - * @brief Implements JSON-LD signatures + * Implements JSON-LD signatures * * Ported from Osada: https://framagit.org/macgirvin/osada */ @@ -27,7 +43,7 @@ class LDSignature } $actor = JsonLD::fetchElement($data, 'actor', 'id'); - if (empty($actor)) { + if (empty($actor) || !is_string($actor)) { return false; } @@ -41,7 +57,7 @@ class LDSignature $dhash = self::hash(self::signableData($data)); $x = Crypto::rsaVerify($ohash . $dhash, base64_decode($data['signature']['signatureValue']), $pubkey); - Logger::log('LD-verify: ' . intval($x)); + Logger::notice('LD-verify', ['verified' => (int)$x, 'actor' => $profile['url']]); if (empty($x)) { return false; @@ -54,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) ];