Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak

diff --combined lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index b07d70401391b3bdc76c2d8fda7219fe3fe51eea,62024c58c90929f9073ef72f00db9e2d0953ac5b..d40348cb1a764ada4bba67a017dca699162d3b88
--- 1/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
--- 2/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@@ -64,20 -64,16 +64,16 @@@ defmodule Pleroma.Web.ActivityPub.MRF.S
           %{host: actor_host} = _actor_info,
           %{
             "type" => "Create",
-            "object" => child_object
+            "object" => %{} = _child_object
           } = object
-        )
-        when is_map(child_object) do
+        ) do
      media_nsfw =
        Config.get([:mrf_simple, :media_nsfw])
        |> MRF.subdomains_regex()
  
      object =
        if MRF.subdomain_match?(media_nsfw, actor_host) do
-         tags = (child_object["tag"] || []) ++ ["nsfw"]
-         child_object = Map.put(child_object, "tag", tags)
-         child_object = Map.put(child_object, "sensitive", true)
-         Map.put(object, "object", child_object)
+         Kernel.put_in(object, ["object", "sensitive"], true)
        else
          object
        end
@@@ -181,14 -177,6 +177,14 @@@
  
    defp check_banner_removal(_actor_info, object), do: {:ok, object}
  
 +  defp check_object(%{"object" => object} = activity) do
 +    with {:ok, _object} <- filter(object) do
 +      {:ok, activity}
 +    end
 +  end
 +
 +  defp check_object(object), do: {:ok, object}
 +
    @impl true
    def filter(%{"type" => "Delete", "actor" => actor} = object) do
      %{host: actor_host} = URI.parse(actor)
@@@ -214,8 -202,7 +210,8 @@@
           {:ok, object} <- check_media_nsfw(actor_info, object),
           {:ok, object} <- check_ftl_removal(actor_info, object),
           {:ok, object} <- check_followers_only(actor_info, object),
 -         {:ok, object} <- check_report_removal(actor_info, object) do
 +         {:ok, object} <- check_report_removal(actor_info, object),
 +         {:ok, object} <- check_object(object) do
        {:ok, object}
      else
        {:reject, nil} -> {:reject, "[SimplePolicy]"}
@@@ -240,19 -227,6 +236,19 @@@
      end
    end
  
 +  def filter(object) when is_binary(object) do
 +    uri = URI.parse(object)
 +
 +    with {:ok, object} <- check_accept(uri, object),
 +         {:ok, object} <- check_reject(uri, object) do
 +      {:ok, object}
 +    else
 +      {:reject, nil} -> {:reject, "[SimplePolicy]"}
 +      {:reject, _} = e -> e
 +      _ -> {:reject, "[SimplePolicy]"}
 +    end
 +  end
 +
    def filter(object), do: {:ok, object}
  
    @impl true

diff --combined test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
index 8024a24594c415efc774060ffe0b048bd7a33720,5c0aff26eb3bb6f1f714613cda67f8ea4b87d337..9c263c7e6fd1cc50de0069d4acf10555c41d7c42
--- 1/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
--- 2/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
@@@ -75,10 -75,7 +75,7 @@@ defmodule Pleroma.Web.ActivityPub.MRF.S
        local_message = build_local_message()
  
        assert SimplePolicy.filter(media_message) ==
-                {:ok,
-                 media_message
-                 |> put_in(["object", "tag"], ["foo", "nsfw"])
-                 |> put_in(["object", "sensitive"], true)}
+                {:ok, put_in(media_message, ["object", "sensitive"], true)}
  
        assert SimplePolicy.filter(local_message) == {:ok, local_message}
      end
@@@ -89,10 -86,7 +86,7 @@@
        local_message = build_local_message()
  
        assert SimplePolicy.filter(media_message) ==
-                {:ok,
-                 media_message
-                 |> put_in(["object", "tag"], ["foo", "nsfw"])
-                 |> put_in(["object", "sensitive"], true)}
+                {:ok, put_in(media_message, ["object", "sensitive"], true)}
  
        assert SimplePolicy.filter(local_message) == {:ok, local_message}
      end
@@@ -260,30 -254,6 +254,30 @@@
  
        assert {:reject, _} = SimplePolicy.filter(remote_user)
      end
 +
 +    test "reject Announce when object would be rejected" do
 +      clear_config([:mrf_simple, :reject], ["blocked.tld"])
 +
 +      announce = %{
 +        "type" => "Announce",
 +        "actor" => "https://okay.tld/users/alice",
 +        "object" => %{"type" => "Note", "actor" => "https://blocked.tld/users/bob"}
 +      }
 +
 +      assert {:reject, _} = SimplePolicy.filter(announce)
 +    end
 +
 +    test "reject by URI object" do
 +      clear_config([:mrf_simple, :reject], ["blocked.tld"])
 +
 +      announce = %{
 +        "type" => "Announce",
 +        "actor" => "https://okay.tld/users/alice",
 +        "object" => "https://blocked.tld/activities/1"
 +      }
 +
 +      assert {:reject, _} = SimplePolicy.filter(announce)
 +    end
    end
  
    describe "when :followers_only" do