nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.

Browse source
This commit is contained in:
Mark Felder 2020-09-04 17:56:05 -05:00 committed by rinpatch
parent 3a98960c26
commit 216c84a8f4
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/upload/filter/exiftool.ex
View file

@ -10,8 +10,11 @@ defmodule Pleroma.Upload.Filter.Exiftool do
@behaviour Pleroma.Upload.Filter @behaviour Pleroma.Upload.Filter
@spec filter(Pleroma.Upload.t()) :: {:ok, any()} | {:error, String.t()} @spec filter(Pleroma.Upload.t()) :: {:ok, any()} | {:error, String.t()}
# webp is not compatible with exiftool at this time
def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
def filter(%Pleroma.Upload{name: file, tempfile: path, content_type: "image" <> _}) do def filter(%Pleroma.Upload{name: file, tempfile: path, content_type: "image" <> _}) do
# webp is not compatible with exiftool at this time
if Regex.match?(~r/\.(webp)$/i, file) do if Regex.match?(~r/\.(webp)$/i, file) do
{:ok, :noop} {:ok, :noop}
else else

10
test/upload/filter/exiftool_test.exs
View file

@ -34,11 +34,15 @@ test "apply exiftool filter" do
test "verify webp files are skipped" do test "verify webp files are skipped" do
upload = %Pleroma.Upload{ upload = %Pleroma.Upload{
name: "sample.webp", name: "sample.webp",
content_type: "image/webp", content_type: "image/webp"
path: Path.absname("/dev/null"), }
tempfile: Path.absname("/dev/null")
bad_type = %Pleroma.Upload{
name: "sample.webp",
content_type: "image/jpeg"
} }
assert Filter.Exiftool.filter(upload) == {:ok, :noop} assert Filter.Exiftool.filter(upload) == {:ok, :noop}
assert Filter.Exiftool.filter(bad_type) == {:ok, :noop}
end end
end end