bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #11857 from annando/diaspora-author-signature

Browse source 
Diaspora: Don't check the author signature when author = parent author
This commit is contained in:
Tobias Diekershoff 2022-08-22 15:02:57 +02:00 committed by GitHub
commit aaaf928650
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Protocol/Diaspora.php
View file

@ -629,7 +629,7 @@ class Diaspora
$type = $element->getName(); $type = $element->getName();
$orig_type = $type; $orig_type = $type;
Logger::debug('Got message type ' . $type . ': ' . $msg['message']); Logger::debug('Got message', ['type' => $type, 'message' => $msg['message']]);
// All retractions are handled identically from now on. // All retractions are handled identically from now on.
// In the new version there will only be "retraction". // In the new version there will only be "retraction".
@ -714,9 +714,15 @@ class Diaspora
if (!in_array($type, ['comment', 'like'])) { if (!in_array($type, ['comment', 'like'])) {
return $fields; return $fields;
} }
if (!isset($author_signature) && ($msg['author'] == $fields->author)) {
Logger::debug('No author signature, but the sender matches the author', ['type' => $type, 'msg-author' => $msg['author'], 'message' => $msg['message']]);
return $fields;
}
// No author_signature? This is a must, so we quit. // No author_signature? This is a must, so we quit.
if (!isset($author_signature)) { if (!isset($author_signature)) {
Logger::info('No author signature for type ' . $type . ' - Message: ' . $msg['message']); Logger::info('No author signature', ['type' => $type, 'msg-author' => $msg['author'], 'fields-author' => $fields->author, 'message' => $msg['message']]);
return false; return false;
} }