From 70be301d6988c229b18e165b6501f988359181ff Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Wed, 2 Jan 2019 01:12:02 +0100
Subject: [PATCH] Ensure blocked user unfollows blocker if Block/Undo Block are
processed out of order (#9687)
* Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order
* Add specs for Block causing unfollow and for out-of-order Block + Undo
---
app/lib/activitypub/activity/block.rb | 5 +-
spec/lib/activitypub/activity/block_spec.rb | 67 +++++++++++++++++++--
2 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/app/lib/activitypub/activity/block.rb b/app/lib/activitypub/activity/block.rb
index 26da8bdf5c..a17a2d50a6 100644
--- a/app/lib/activitypub/activity/block.rb
+++ b/app/lib/activitypub/activity/block.rb
@@ -4,9 +4,10 @@ class ActivityPub::Activity::Block < ActivityPub::Activity
def perform
target_account = account_from_uri(object_uri)
- return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.blocking?(target_account)
+ return if target_account.nil? || !target_account.local? || @account.blocking?(target_account)
UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
- @account.block!(target_account, uri: @json['id'])
+
+ @account.block!(target_account, uri: @json['id']) unless delete_arrived_first?(@json['id'])
end
end
diff --git a/spec/lib/activitypub/activity/block_spec.rb b/spec/lib/activitypub/activity/block_spec.rb
index 23c8cc31cf..94d37356dd 100644
--- a/spec/lib/activitypub/activity/block_spec.rb
+++ b/spec/lib/activitypub/activity/block_spec.rb
@@ -14,15 +14,72 @@ RSpec.describe ActivityPub::Activity::Block do
}.with_indifferent_access
end
- describe '#perform' do
- subject { described_class.new(json, sender) }
+ context 'when the recipient does not follow the sender' do
+ describe '#perform' do
+ subject { described_class.new(json, sender) }
+
+ before do
+ subject.perform
+ end
+
+ it 'creates a block from sender to recipient' do
+ expect(sender.blocking?(recipient)).to be true
+ end
+ end
+ end
+
+ context 'when the recipient follows the sender' do
+ before do
+ recipient.follow!(sender)
+ end
+
+ describe '#perform' do
+ subject { described_class.new(json, sender) }
+
+ before do
+ subject.perform
+ end
+
+ it 'creates a block from sender to recipient' do
+ expect(sender.blocking?(recipient)).to be true
+ end
+
+ it 'ensures recipient is not following sender' do
+ expect(recipient.following?(sender)).to be false
+ end
+ end
+ end
+
+ context 'when a matching undo has been received first' do
+ let(:undo_json) do
+ {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ id: 'bar',
+ type: 'Undo',
+ actor: ActivityPub::TagManager.instance.uri_for(sender),
+ object: json,
+ }.with_indifferent_access
+ end
before do
- subject.perform
+ recipient.follow!(sender)
+ ActivityPub::Activity::Undo.new(undo_json, sender).perform
end
- it 'creates a block from sender to recipient' do
- expect(sender.blocking?(recipient)).to be true
+ describe '#perform' do
+ subject { described_class.new(json, sender) }
+
+ before do
+ subject.perform
+ end
+
+ it 'does not create a block from sender to recipient' do
+ expect(sender.blocking?(recipient)).to be false
+ end
+
+ it 'ensures recipient is not following sender' do
+ expect(recipient.following?(sender)).to be false
+ end
end
end
end
--
GitLab