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

Upload: Fix uploading with a : in the filename

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2019-01-15 07:57:48 +01:00
parent e3eb75bd23
commit 9fcdca1bdc
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/upload.ex
View file

@ -219,6 +219,7 @@ defp url_from_spec(base_url, {:file, path}) do
path path
|> URI.encode() |> URI.encode()
|> String.replace("?", "%3F") |> String.replace("?", "%3F")
|> String.replace(":", "%3A")
[base_url, "media", path] [base_url, "media", path]
|> Path.join() |> Path.join()

6
test/upload_test.exs
View file

@ -153,19 +153,19 @@ test "escapes invalid characters in url" do
assert Path.basename(attachment_url["href"]) == "an%E2%80%A6%20image.jpg" assert Path.basename(attachment_url["href"]) == "an%E2%80%A6%20image.jpg"
end end
test "replaces ? (question-mark) to %3f" do test "replaces : (colon) and ? (question-mark) to %3A and %3F (respectively)" do
File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg") File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
file = %Plug.Upload{ file = %Plug.Upload{
content_type: "image/jpg", content_type: "image/jpg",
path: Path.absname("test/fixtures/image_tmp.jpg"), path: Path.absname("test/fixtures/image_tmp.jpg"),
filename: "an?image.jpg" filename: "is:an?image.jpg"
} }
{:ok, data} = Upload.store(file) {:ok, data} = Upload.store(file)
[attachment_url | _] = data["url"] [attachment_url | _] = data["url"]
assert Path.basename(attachment_url["href"]) == "an%3Fimage.jpg" assert Path.basename(attachment_url["href"]) == "is%3Aan%3Fimage.jpg"
end end
end end
end end