Merge pull request #11887 from annando/maxload

[friendica.git] / src / Protocol / Diaspora.php

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index d40d548350eff5eb899bebba2589ba0582956548..9e80c130282428401353223353ec1cac6fd4c6d9 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -475,7 +475,7 @@ class Diaspora
                }
 
                if (!($fields = self::validPosting($msg))) {
-                       Logger::notice('Invalid posting');
+                       Logger::warning('Invalid posting');
                        return false;
                }
 
@@ -510,7 +510,7 @@ class Diaspora
                if (is_null($fields)) {
                        $private = true;
                        if (!($fields = self::validPosting($msg))) {
-                               Logger::notice('Invalid posting');
+                               Logger::warning('Invalid posting');
                                return false;
                        }
                } else {
@@ -629,7 +629,7 @@ class Diaspora
                $type = $element->getName();
                $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.
                // In the new version there will only be "retraction".
@@ -714,9 +714,15 @@ class Diaspora
                if (!in_array($type, ['comment', 'like'])) {
                        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.
                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;
                }
 
@@ -728,7 +734,7 @@ class Diaspora
                        }
 
                        if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, 'sha256')) {
-                               Logger::info('No valid parent author signature for parent author ' . $msg['author'] . ' in type ' . $type . ' - signed data: ' . $signed_data . ' - Message: ' . $msg['message'] . ' - Signature ' . $parent_author_signature);
+                               Logger::info('No valid parent author signature', ['author' => $msg['author'], 'type' => $type, 'signed data' => $signed_data, 'message'  => $msg['message'], 'signature' => $parent_author_signature]);
                                return false;
                        }
                }
@@ -740,7 +746,7 @@ class Diaspora
                }
 
                if (!Crypto::rsaVerify($signed_data, $author_signature, $key, 'sha256')) {
-                       Logger::info('No valid author signature for author ' . $fields->author . ' in type ' . $type . ' - signed data: ' . $signed_data . ' - Message: ' . $msg['message'] . ' - Signature ' . $author_signature);
+                       Logger::info('No valid author signature for author', ['author' => $fields->author, 'type' => $type, 'signed data' => $signed_data, 'message'  => $msg['message'], 'signature' => $author_signature]);
                        return false;
                } else {
                        return $fields;
@@ -1705,7 +1711,7 @@ class Diaspora
                        }
                }
                if (!$conversation) {
-                       Logger::notice('Unable to create conversation.');
+                       Logger::warning('Unable to create conversation.');
                        return false;
                }
 
@@ -1995,11 +2001,11 @@ class Diaspora
                Logger::info('Participation stored', ['id' => $message_id, 'guid' => $guid, 'parent_guid' => $parent_guid, 'author' => $author]);
 
                // Send all existing comments and likes to the requesting server
-               $comments = Post::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb'],
+               $comments = Post::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb', 'gravity'],
                        ['parent' => $toplevel_parent_item['id'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
                while ($comment = Post::fetch($comments)) {
-                       if (in_array($comment['verb'], [Activity::FOLLOW, Activity::TAG])) {
-                               Logger::info('participation messages are not relayed', ['item' => $comment['id']]);
+                       if (($comment['gravity'] == GRAVITY_ACTIVITY) && !in_array($comment['verb'], [Activity::LIKE, Activity::DISLIKE])) {
+                               Logger::info('Unsupported activities are not relayed', ['item' => $comment['id'], 'verb' => $comment['verb']]);
                                continue;
                        }
 
@@ -2014,7 +2020,7 @@ class Diaspora
                        }
 
                        Logger::info('Deliver participation', ['item' => $comment['id'], 'contact' => $author_contact['cid']]);
-                       if (Worker::add(PRIORITY_HIGH, 'Delivery', Delivery::POST, $comment['id'], $author_contact['cid'])) {
+                       if (Worker::add(PRIORITY_HIGH, 'Delivery', Delivery::POST, $comment['uri-id'], $author_contact['cid'], $datarray['uid'])) {
                                Post\DeliveryData::incrementQueueCount($comment['uri-id'], 1);
                        }
                }
@@ -3638,7 +3644,7 @@ class Diaspora
                                $attend_answer = 'tentative';
                                break;
                        default:
-                               Logger::notice('Unknown verb ' . $item['verb'] . ' in item ' . $item['guid']);
+                               Logger::warning('Unknown verb ' . $item['verb'] . ' in item ' . $item['guid']);
                                return false;
                }