From e99fdfc32db231391184220eb28024d358821d27 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Fri, 18 Oct 2019 15:34:36 +0000 Subject: [PATCH] object: containment: only allow OStatus references in test suite environment --- lib/pleroma/object/containment.ex | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/pleroma/object/containment.ex b/lib/pleroma/object/containment.ex index 6a621ac26..1beb9c83d 100644 --- a/lib/pleroma/object/containment.ex +++ b/lib/pleroma/object/containment.ex @@ -32,6 +32,23 @@ defmodule Pleroma.Object.Containment do get_actor(%{"actor" => actor}) end + # TODO: We explicitly allow 'tag' URIs through, due to references to legacy OStatus + # objects being present in the test suite environment. Once these objects are + # removed, please also remove this. + if Mix.env() == :test do + defp compare_uris(_, %URI{scheme: "tag" <> _}), do: :ok + end + + defp compare_uris(%URI{} = id_uri, %URI{} = other_uri) do + if id_uri.host == other_uri.host do + :ok + else + :error + end + end + + defp compare_uris(_, _), do: :error + @doc """ Checks that an imported AP object's actor matches the domain it came from. """ @@ -41,11 +58,7 @@ defmodule Pleroma.Object.Containment do id_uri = URI.parse(id) actor_uri = URI.parse(get_actor(params)) - if id_uri.host == actor_uri.host || id_uri.scheme == "tag" do - :ok - else - :error - end + compare_uris(actor_uri, id_uri) end def contain_origin(id, %{"attributedTo" => actor} = params), @@ -57,13 +70,7 @@ defmodule Pleroma.Object.Containment do id_uri = URI.parse(id) other_uri = URI.parse(other_id) - # We explicitly allow 'tag' URIs through, due to legacy OStatus objects - # being present in the ActivityPub network. - if id_uri.host == other_uri.host || other_uri.scheme == "tag" do - :ok - else - :error - end + compare_uris(id_uri, other_uri) end def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}), -- 2.45.2