mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-22 16:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'exif' into 'develop'

Browse source 
Ensure StripLocation works for PNGs

See merge request pleroma/pleroma!4167
This commit is contained in:
lain 2024-06-30 09:28:17 +00:00
commit ccbbee7963
5 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -6,7 +6,7 @@
/test/instance /test/instance
/test/uploads /test/uploads
/.elixir_ls /.elixir_ls
/test/fixtures/DSCN0010_tmp.jpg /test/fixtures/DSCN0010_tmp*
/test/fixtures/test_tmp.txt /test/fixtures/test_tmp.txt
/test/fixtures/image_tmp.jpg /test/fixtures/image_tmp.jpg
/test/tmp/ /test/tmp/

1
changelog.d/4167-strip-gps-info-in-png.fix Normal file
View file

@ -0,0 +1 @@
Ensure that StripLocation actually removes everything resembling GPS data from PNGs

4
lib/pleroma/upload/filter/exiftool/strip_location.ex
View file

@ -16,7 +16,9 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripLocation do
def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
try do try do
case System.cmd("exiftool", ["-overwrite_original", "-gps:all=", file], parallelism: true) do case System.cmd("exiftool", ["-overwrite_original", "-gps:all=", "-png:all=", file],
parallelism: true
) do
{_response, 0} -> {:ok, :filtered} {_response, 0} -> {:ok, :filtered}
{error, 1} -> {:error, error} {error, 1} -> {:error, error}
end end

BIN
test/fixtures/DSCN0010.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 744 KiB

36
test/pleroma/upload/filter/exiftool/strip_location_test.exs
View file

@ -9,29 +9,31 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripLocationTest do
test "apply exiftool filter" do test "apply exiftool filter" do
assert Pleroma.Utils.command_available?("exiftool") assert Pleroma.Utils.command_available?("exiftool")
File.cp!( ~w{jpg png}
"test/fixtures/DSCN0010.jpg", |> Enum.map(fn type ->
"test/fixtures/DSCN0010_tmp.jpg" File.cp!(
) "test/fixtures/DSCN0010.#{type}",
"test/fixtures/DSCN0010_tmp.#{type}"
)
upload = %Pleroma.Upload{ upload = %Pleroma.Upload{
name: "image_with_GPS_data.jpg", name: "image_with_GPS_data.#{type}",
content_type: "image/jpeg", content_type: "image/jpeg",
path: Path.absname("test/fixtures/DSCN0010.jpg"), path: Path.absname("test/fixtures/DSCN0010.#{type}"),
tempfile: Path.absname("test/fixtures/DSCN0010_tmp.jpg") tempfile: Path.absname("test/fixtures/DSCN0010_tmp.#{type}")
} }
assert Filter.Exiftool.StripLocation.filter(upload) == {:ok, :filtered} assert Filter.Exiftool.StripLocation.filter(upload) == {:ok, :filtered}
{exif_original, 0} = System.cmd("exiftool", ["test/fixtures/DSCN0010.jpg"]) {exif_original, 0} = System.cmd("exiftool", ["test/fixtures/DSCN0010.#{type}"])
{exif_filtered, 0} = System.cmd("exiftool", ["test/fixtures/DSCN0010_tmp.jpg"]) {exif_filtered, 0} = System.cmd("exiftool", ["test/fixtures/DSCN0010_tmp.#{type}"])
refute exif_original == exif_filtered assert String.match?(exif_original, ~r/GPS/)
assert String.match?(exif_original, ~r/GPS/) refute String.match?(exif_filtered, ~r/GPS/)
refute String.match?(exif_filtered, ~r/GPS/) end)
end end
test "verify webp, heic, svg files are skipped" do test "verify webp, heic, svg files are skipped" do
uploads = uploads =
~w{webp heic svg svg+xml} ~w{webp heic svg svg+xml}
|> Enum.map(fn type -> |> Enum.map(fn type ->