mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 16:40:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'

Browse source 
MediaProxy: parse filename from content-disposition for non-whitelisted types

See merge request pleroma/pleroma!936
This commit is contained in:
kaniini 2019-03-15 20:06:08 +00:00
commit 4b3c86c1a6
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/pleroma/reverse_proxy.ex
View file

@ -311,7 +311,25 @@ defmodule Pleroma.ReverseProxy do
end
if attachment? do
disposition = "attachment; filename=" <> Keyword.get(opts, :attachment_name, "attachment")
name =
try do
{{"content-disposition", content_disposition_string}, _} =
List.keytake(headers, "content-disposition", 0)
[name | _] =
Regex.run(
~r/filename="((?:[^"\\]|\\.)*)"/u,
content_disposition_string || "",
capture: :all_but_first
)
name
rescue
MatchError -> Keyword.get(opts, :attachment_name, "attachment")
end
disposition = "attachment; filename=\"#{name}\""
List.keystore(headers, "content-disposition", 0, {"content-disposition", disposition})
else
headers