Merge branch 'exif' into 'develop'

Ensure StripLocation works for PNGs

See merge request pleroma/pleroma!4167

.gitignore

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

changelog.d/4167-strip-gps-info-in-png.fix

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

lib/pleroma/upload/filter/exiftool/strip_location.ex

@@ -16,7 +16,9 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripLocation do
 
   def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) 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}
         {error, 1} -> {:error, error}
       end

test/pleroma/upload/filter/exiftool/strip_location_test.exs

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