Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 21:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Diaspora signatures are now stored and transmitted correctly

Browse source
This commit is contained in:
Michael 2018-10-27 14:35:22 +00:00
parent ea7a08ace2
commit 4831688dc0
6 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Protocol/ActivityPub/Processor.php
View file

@ -144,6 +144,8 @@ class Processor
self::fetchMissingActivity($activity['reply-to-id'], $activity);
}
$item['diaspora_signed_text'] = defaults($activity, 'diaspora:comment', '');
self::postItem($activity, $item);
}
@ -174,6 +176,8 @@ class Processor
$item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE;
$item['diaspora_signed_text'] = defaults($activity, 'diaspora:like', '');
self::postItem($activity, $item);
}
@ -260,7 +264,6 @@ class Processor
$item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']);
$item['app'] = $activity['generator'];
$item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
$item['diaspora_signed_text'] = defaults($activity, 'diaspora:comment', '');
$item = self::constructAttachList($activity['attachments'], $item);

1
src/Protocol/ActivityPub/Receiver.php
View file

@ -705,6 +705,7 @@ class Receiver
$object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid');
$object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment');
$object_data['diaspora:like'] = JsonLD::fetchElement($object, 'diaspora:like');
$object_data['actor'] = $object_data['author'] = $actor;
$object_data['context'] = JsonLD::fetchElement($object, 'as:context');
$object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation');

3
src/Protocol/ActivityPub/Transmitter.php
View file

@ -627,6 +627,9 @@ class Transmitter
$data['object'] = self::createActivityFromItem($item_id, true);
} else {
$data['diaspora:guid'] = $item['guid'];
if (!empty($item['signed_text'])) {
$data['diaspora:like'] = $item['signed_text'];
}
$data['object'] = $item['thr-parent'];
}

33
src/Protocol/Diaspora.php
View file

@ -4150,23 +4150,27 @@ class Diaspora
}
/**
* @brief Stores the signature for comments that are created on our system
* @brief Creates the signature for Comments that are created on our system
*
* @param array $item The item array of the comment
* @param array $contact The contact array of the item owner
* @param string $uprvkey The private key of the sender
* @param int $message_id The message id of the comment
* @param array $contact The contact array of the comment
* @param array $item Item array
*
* @return bool Success
* @return array Signed content
*/
public static function storeCommentSignature(array $item, array $contact, $uprvkey, $message_id)
public static function createCommentSignature(array $contact, array $item)
{
if ($uprvkey == "") {
logger('No private key, so not storing comment signature', LOGGER_DEBUG);
// Is the contact the owner? Then fetch the private key
if (!$contact['self'] || ($contact['uid'] == 0)) {
logger("No owner post, so not storing signature", LOGGER_DEBUG);
return false;
}
$contact["uprvkey"] = $uprvkey;
$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $contact["uid"]]);
if (!DBA::isResult($user)) {
return false;
}
$contact["uprvkey"] = $user['prvkey'];
$message = self::constructComment($item, $contact);
if ($message === false) {
@ -4175,13 +4179,6 @@ class Diaspora
$message["author_signature"] = self::signature($contact, $message);
/*
* Now store the signature more flexible to dynamically support new fields.
* This will break Diaspora compatibility with Friendica versions prior to 3.5.
*/
DBA::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($message)]);
logger('Stored diaspora comment signature');
return true;
return $message;
}
}