fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 06:58:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'media-url-escape' into 'develop'

Browse source 
URI escape file upload URLs

See merge request pleroma/pleroma!665
This commit is contained in:
rinpatch 2019-01-14 18:52:23 +00:00
parent fd2f1258fb dcbe5bd58c
commit f20bfc9ea5
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/upload.ex
View file

@ -215,7 +215,7 @@ defmodule Pleroma.Upload do
end
defp url_from_spec(base_url, {:file, path}) do
[base_url, "media", path]
[base_url, "media", URI.encode(path)]
|> Path.join()
end

15
test/upload_test.exs
View file

@ -137,5 +137,20 @@ defmodule Pleroma.UploadTest do
refute data["name"] == "an [image.jpg"
end
test "escapes invalid characters in url" do
File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
file = %Plug.Upload{
content_type: "image/jpg",
path: Path.absname("test/fixtures/image_tmp.jpg"),
filename: "an… image.jpg"
}
{:ok, data} = Upload.store(file)
[attachment_url | _] = data["url"]
assert Path.basename(attachment_url["href"]) == "an%E2%80%A6%20image.jpg"
end
end
end