namespace Friendica\Util;
-use Friendica\Util\JsonLD;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Protocol\ActivityPub;
-
+use Friendica\Core\Logger;
+use Friendica\Model\APContact;
+
+/**
+ * Implements JSON-LD signatures
+ *
+ * Ported from Osada: https://framagit.org/macgirvin/osada
+ */
class LDSignature
{
public static function isSigned($data)
return !empty($data['signature']);
}
- public static function isVerified($data, $pubkey = null)
+ public static function getSigner($data)
{
if (!self::isSigned($data)) {
return false;
}
- if (empty($pubkey)) {
- $actor = JsonLD::fetchElement($data, 'actor', 'id');
- if (empty($actor)) {
- return false;
- }
-
- $profile = ActivityPub::fetchprofile($actor);
- if (empty($profile['pubkey'])) {
- return false;
- }
- $pubkey = $profile['pubkey'];
+ $actor = JsonLD::fetchElement($data, 'actor', 'id');
+ if (empty($actor) || !is_string($actor)) {
+ return false;
}
- $ohash = self::hash(self::signable_options($data['signature']));
- $dhash = self::hash(self::signable_data($data));
+ $profile = APContact::getByURL($actor);
+ if (empty($profile['pubkey'])) {
+ return false;
+ }
+ $pubkey = $profile['pubkey'];
+
+ $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));
- return $x;
+ if (empty($x)) {
+ return false;
+ } else {
+ return $actor;
+ }
}
public static function sign($data, $owner)
{
$options = [
'type' => 'RsaSignature2017',
- 'nonce' => random_string(64),
+ 'nonce' => Strings::getRandomHex(64),
'creator' => $owner['url'] . '#main-key',
- 'created' => DateTimeFormat::utcNow()
+ '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)
{
- $newdata = [];
- if (!empty($data)) {
- foreach ($data as $k => $v) {
- if (!in_array($k, ['signature'])) {
- $newdata[$k] = $v;
- }
- }
- }
- return $newdata;
+ unset($data['signature']);
+ return $data;
}
-
- private static function signable_options($options)
+ private static function signableOptions($options)
{
$newopts = ['@context' => 'https://w3id.org/identity/v1'];
- if (!empty($options)) {
- foreach ($options as $k => $v) {
- if (!in_array($k, ['type','id','signatureValue'])) {
- $newopts[$k] = $v;
- }
- }
- }
- return $newopts;
+
+ unset($options['type']);
+ unset($options['id']);
+ unset($options['signatureValue']);
+
+ return array_merge($newopts, $options);
}
private static function hash($obj)