PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-30 14:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix escaping error in image filenames

Browse source
This commit is contained in:
byte[] 2021-02-09 17:14:34 -05:00
parent a5904b1fcd
commit 4be6e23400
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/philomena/images/image.ex
View file

@ -326,8 +326,9 @@ defmodule Philomena.Images.Image do
file_name_slug_fragment = file_name_slug_fragment =
tags tags
|> Enum.map_join("_", & &1.slug) |> Enum.map_join("_", & &1.slug)
|> String.replace("%", "") |> String.to_charlist()
|> String.replace("/", "") |> Enum.filter(&(&1 in ?a..?z or &1 in '0123456789_-'))
|> List.to_string()
|> String.slice(0..150) |> String.slice(0..150)
file_name_cache = "#{image_id}__#{file_name_slug_fragment}" file_name_cache = "#{image_id}__#{file_name_slug_fragment}"

6
lib/philomena_web/views/image_view.ex
View file

@ -108,7 +108,7 @@ defmodule PhilomenaWeb.ImageView do
root = image_url_root() root = image_url_root()
view = if download, do: "download", else: "view" view = if download, do: "download", else: "view"
filename = if short, do: image.id, else: image.file_name_cache filename = if short, do: image.id, else: escaped_file_name(image)
format = format =
image.image_format image.image_format
@ -119,6 +119,10 @@ defmodule PhilomenaWeb.ImageView do
"#{root}/#{view}/#{year}/#{month}/#{day}/#{filename}.#{format}" "#{root}/#{view}/#{year}/#{month}/#{day}/#{filename}.#{format}"
end end
defp escaped_file_name(image) do
URI.encode(image.file_name_cache, &(&1 == ?+ or URI.char_unreserved?(&1)))
end
def image_url_root do def image_url_root do
Application.get_env(:philomena, :image_url_root) Application.get_env(:philomena, :image_url_root)
end end