X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Freverse_proxy.ex;h=a3f177fec06d4ea8ab3da7e41d9a159663ca02ff;hb=68c75a08e8593d41f496a362ab1be43d054c09d5;hp=39ede8619a77c974432025151458e35dcedb1263;hpb=958227d5563d76f4f983b7cabb6948897d93bd4b;p=akkoma

diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex
index 39ede8619..a3f177fec 100644
--- a/lib/pleroma/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy.ex
@@ -316,9 +316,9 @@ defmodule Pleroma.ReverseProxy do
           {{"content-disposition", content_disposition_string}, _} =
             List.keytake(headers, "content-disposition", 0)
 
-          [name] =
+          [name | _] =
             Regex.run(
-              ~r/filename=\"(.*)\"/u,
+              ~r/filename="((?:[^"\\]|\\.)*)"/u,
               content_disposition_string || "",
               capture: :all_but_first
             )
@@ -328,7 +328,7 @@ defmodule Pleroma.ReverseProxy do
           MatchError -> Keyword.get(opts, :attachment_name, "attachment")
         end
 
-      disposition = "attachment; filename=" <> name
+      disposition = "attachment; filename=\"#{name}\""
 
       List.keystore(headers, "content-disposition", 0, {"content-disposition", disposition})
     else