stefan230/akkoma
1
0
Fork 0
forked from YokaiRick/akkoma
Code Pull requests Activity

UploadedMedia: Add missing disposition_type to Content-Disposition

Browse source 
Set it to `inline` because the vast majority of what's sent is multimedia
content while `attachment` would have the side-effect of triggering a
download dialog.

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3114
This commit is contained in:
Haelwenn (lanodan) Monnier 2023-04-17 21:07:08 +02:00 committed by XxXCertifiedForkliftDriverXxX
parent 1def80c2e7
commit 37b0d774fa
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/plugs/uploaded_media.ex
View file

@ -37,7 +37,7 @@ def call(%{request_path: <<"/", @path, "/", file::binary>>} = conn, opts) do
%{query_params: %{"name" => name}} = conn -> %{query_params: %{"name" => name}} = conn ->
name = escape_header_value(name) name = escape_header_value(name)
put_resp_header(conn, "content-disposition", "filename=\"#{name}\"") put_resp_header(conn, "content-disposition", "inline; filename=\"#{name}\"")
conn -> conn ->
conn conn

4
test/pleroma/web/plugs/uploaded_media_plug_test.exs
View file

@ -37,7 +37,7 @@ test "sends Content-Disposition header when name param is set", %{
assert Enum.any?( assert Enum.any?(
conn.resp_headers, conn.resp_headers,
&(&1 == {"content-disposition", "filename=\"\\\"cofe\\\".gif\""}) &(&1 == {"content-disposition", "inline; filename=\"\\\"cofe\\\".gif\""})
) )
end end
@ -48,7 +48,7 @@ test "removes control characters from the Content-Disposition header", %{
assert Enum.any?( assert Enum.any?(
conn.resp_headers, conn.resp_headers,
&(&1 == {"content-disposition", "filename=\"\\\"cofe\\\".gif\""}) &(&1 == {"content-disposition", ~s[inline; filename="\\"cofe\\".gif"]})
) )
end end
end end