Merge branch 'tusooa/3154-attachment-type-check' into 'develop'

Restrict attachments to only uploaded files only

Closes #3154

See merge request pleroma/pleroma!3923
This commit is contained in:
Haelwenn 2023-08-03 10:01:32 +00:00
commit 819fccb7d1
4 changed files with 17 additions and 4 deletions

View File

@ -0,0 +1 @@
Restrict attachments to only uploaded files only

View File

@ -81,4 +81,6 @@ defmodule Pleroma.Constants do
const(mime_regex,
do: ~r/^[^[:cntrl:] ()<>@,;:\\"\/\[\]?=]+\/[^[:cntrl:] ()<>@,;:\\"\/\[\]?=]+(; .*)?$/
)
const(upload_object_types, do: ["Document", "Image"])
end

View File

@ -59,7 +59,12 @@ def attachments_from_ids_descs(ids, descs_str) do
end
defp get_attachment(media_id) do
Repo.get(Object, media_id)
with %Object{data: data} = object <- Repo.get(Object, media_id),
%{"type" => type} when type in Pleroma.Constants.upload_object_types() <- data do
object
else
_ -> nil
end
end
@spec get_to_and_cc(ActivityDraft.t()) :: {list(String.t()), list(String.t())}

View File

@ -592,7 +592,7 @@ test "returns [] when attachment ids is empty" do
end
test "returns list attachments with desc" do
object = insert(:note)
object = insert(:attachment)
desc = Jason.encode!(%{object.id => "test-desc"})
assert Utils.attachments_from_ids_descs(["#{object.id}", "34"], desc) == [
@ -603,7 +603,7 @@ test "returns list attachments with desc" do
describe "attachments_from_ids/1" do
test "returns attachments with descs" do
object = insert(:note)
object = insert(:attachment)
desc = Jason.encode!(%{object.id => "test-desc"})
assert Utils.attachments_from_ids(%{
@ -615,13 +615,18 @@ test "returns attachments with descs" do
end
test "returns attachments without descs" do
object = insert(:note)
object = insert(:attachment)
assert Utils.attachments_from_ids(%{media_ids: ["#{object.id}"]}) == [object.data]
end
test "returns [] when not pass media_ids" do
assert Utils.attachments_from_ids(%{}) == []
end
test "checks that the object is of upload type" do
object = insert(:note)
assert Utils.attachments_from_ids(%{media_ids: ["#{object.id}"]}) == []
end
end
describe "maybe_add_list_data/3" do