From: lain <lain@soykaf.club>
Date: Fri, 26 Jun 2020 09:58:40 +0000 (+0200)
Subject: BlockValidator: Restore old behavior for incoming blocks.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c3383d4fab6181d9f605a6058805333611534398;p=akkoma

BlockValidator: Restore old behavior for incoming blocks.
---

diff --git a/lib/pleroma/web/activity_pub/object_validators/block_validator.ex b/lib/pleroma/web/activity_pub/object_validators/block_validator.ex
index 1dde77198..1989585b7 100644
--- a/lib/pleroma/web/activity_pub/object_validators/block_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/block_validator.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.BlockValidator do
   use Ecto.Schema
 
   alias Pleroma.EctoType.ActivityPub.ObjectValidators
+  alias Pleroma.User
 
   import Ecto.Changeset
   import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@@ -32,6 +33,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.BlockValidator do
     |> validate_inclusion(:type, ["Block"])
     |> validate_actor_presence()
     |> validate_actor_presence(field_name: :object)
+    |> validate_block_acceptance()
   end
 
   def cast_and_validate(data) do
@@ -39,4 +41,15 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.BlockValidator do
     |> cast_data
     |> validate_data
   end
+
+  def validate_block_acceptance(cng) do
+    actor = get_field(cng, :actor) |> User.get_cached_by_ap_id()
+
+    if actor.local || Pleroma.Config.get([:activitypub, :unfollow_blocked], true) do
+      cng
+    else
+      cng
+      |> add_error(:actor, "Not accepting remote blocks")
+    end
+  end
 end
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index 48350d2b3..5cc2eb378 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -29,7 +29,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
       ) do
     with %User{} = blocker <- User.get_cached_by_ap_id(blocking_user),
          %User{} = blocked <- User.get_cached_by_ap_id(blocked_user) do
-      User.unfollow(blocker, blocked)
       User.block(blocker, blocked)
     end
 
diff --git a/test/web/activity_pub/object_validator_test.exs b/test/web/activity_pub/object_validator_test.exs
index e96552763..a3d43ef3c 100644
--- a/test/web/activity_pub/object_validator_test.exs
+++ b/test/web/activity_pub/object_validator_test.exs
@@ -657,7 +657,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidatorTest do
 
   describe "blocks" do
     setup do
-      user = insert(:user)
+      user = insert(:user, local: false)
       blocked = insert(:user)
 
       {:ok, valid_block, []} = Builder.block(user, blocked)
@@ -680,5 +680,11 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidatorTest do
 
       assert {:error, _cng} = ObjectValidator.validate(block, [])
     end
+
+    test "returns an error if don't accept remote blocks", %{valid_block: valid_block} do
+      clear_config([:activitypub, :unfollow_blocked], false)
+
+      assert {:error, _cng} = ObjectValidator.validate(valid_block, [])
+    end
   end
 end