hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

object containment: handle all cases where ID is invalid (missing, nil, non-string)

Browse source
This commit is contained in:
Ariadne Conill 2019-11-08 14:51:28 -06:00 • committed by rinpatch
commit 6e65da782e
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/object/containment.ex
View file

@ -51,9 +51,7 @@ defmodule Pleroma.Object.Containment do
def contain_origin(id, %{"attributedTo" => actor} = params),
do: contain_origin(id, Map.put(params, "actor", actor))
def contain_origin_from_id(_id, %{"id" => nil}), do: :error
def contain_origin_from_id(id, %{"id" => other_id} = _params) do
def contain_origin_from_id(id, %{"id" => other_id} = _params) when is_binary(other_id) do
id_uri = URI.parse(id)
other_uri = URI.parse(other_id)
@ -64,6 +62,8 @@ defmodule Pleroma.Object.Containment do
end
end
def contain_origin_from_id(_id, _data), do: :error
def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}),
do: contain_origin(id, object)