diff options
author | Alex Gleason <alex@alexgleason.me> | 2021-04-29 11:51:49 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2021-04-30 14:20:54 -0500 |
commit | c16c7fdb8794df8558cf8fbe4231d8f9ec01bb6d (patch) | |
tree | 1acfbf6a393f00d3025567d17e5b94c48e85cb02 /lib | |
parent | 3d742c3c1af69a9526c12a171663630b3439b5cc (diff) | |
download | pleroma-c16c7fdb8794df8558cf8fbe4231d8f9ec01bb6d.tar.gz pleroma-c16c7fdb8794df8558cf8fbe4231d8f9ec01bb6d.zip |
SimplePolicy: filter string Objects
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index b3e5d814d..b07d70401 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -181,7 +181,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do defp check_banner_removal(_actor_info, object), do: {:ok, object} - defp check_object(%{"object" => object} = activity) when is_map(object) do + defp check_object(%{"object" => object} = activity) do with {:ok, _object} <- filter(object) do {:ok, activity} end @@ -240,6 +240,19 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do 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 |