Commit 2d7da5f4 authored by sxsdv1's avatar sxsdv1
Browse files

Don't crash on AP request for tombstone

Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
parent ba17518a
......@@ -801,6 +801,10 @@ def fetch_and_contain_remote_object_from_id(id) do
end
end
def is_public?(%Object{data: %{"type" => "Tombstone"}}) do
false
end
def is_public?(activity) do
"https://www.w3.org/ns/activitystreams#Public" in (activity.data["to"] ++
(activity.data["cc"] || []))
......
......@@ -57,6 +57,19 @@ def direct_note_factory do
%Pleroma.Object{data: Map.merge(data, %{"to" => [user2.ap_id]})}
end
def tombstone_factory do
data = %{
"type" => "Tombstone",
"id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
"formerType" => "Note",
"deleted" => DateTime.utc_now() |> DateTime.to_iso8601()
}
%Pleroma.Object{
data: data
}
end
def direct_note_activity_factory do
dm = insert(:direct_note)
......
......@@ -75,6 +75,18 @@ test "it returns 404 for non-public messages", %{conn: conn} do
assert json_response(conn, 404)
end
test "it returns 404 for tombstone objects", %{conn: conn} do
tombstone = insert(:tombstone)
uuid = String.split(tombstone.data["id"], "/") |> List.last()
conn =
conn
|> put_req_header("accept", "application/activity+json")
|> get("/objects/#{uuid}")
assert json_response(conn, 404)
end
end
describe "/inbox" do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment