Uploaders.S3: Replace unsafe characters in object key

[akkoma] / lib / pleroma / upload.ex

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 16149d4dd148632485516bc04fb94a93f13ec5d4..f188a5f3285709d28ab56faea4a919fafd1b81ec 100644 (file)
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -1,6 +1,5 @@
 defmodule Pleroma.Upload do
   alias Ecto.UUID
-  import Logger
 
   @storage_backend Application.get_env(:pleroma, Pleroma.Upload)
                    |> Keyword.fetch!(:uploader)
@@ -13,7 +12,8 @@ defmodule Pleroma.Upload do
 
     strip_exif_data(content_type, file.path)
 
-    url_path = @storage_backend.put_file(name, uuid, file, content_type, should_dedupe)
+    {:ok, url_path} =
+      @storage_backend.put_file(name, uuid, file.path, content_type, should_dedupe)
 
     %{
       "type" => "Document",
@@ -28,19 +28,14 @@ defmodule Pleroma.Upload do
     }
   end
 
-  # XXX: does this code actually work?  i am skeptical.  --kaniini
   def store(%{"img" => "data:image/" <> image_data}, should_dedupe) do
     parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
     data = Base.decode64!(parsed["data"], ignore: :whitespace)
 
-    tmp_path = mkupload_for_image(data)
+    tmp_path = tempfile_for_image(data)
 
     uuid = UUID.generate()
 
-    # create temp local storage, like plug upload provides for us.
-
-    Logger.info(tmp_path)
-
     content_type = get_content_type(tmp_path)
     strip_exif_data(content_type, tmp_path)
 
@@ -51,7 +46,7 @@ defmodule Pleroma.Upload do
         content_type
       )
 
-    url_path = @storage_backend.put_file(name, uuid, tmp_path, content_type, should_dedupe)
+    {:ok, url_path} = @storage_backend.put_file(name, uuid, tmp_path, content_type, should_dedupe)
 
     %{
       "type" => "Image",
@@ -66,9 +61,15 @@ defmodule Pleroma.Upload do
     }
   end
 
-  def mkupload_for_image(data) do
+  @doc """
+  Creates a tempfile using the Plug.Upload Genserver which cleans them up 
+  automatically.
+  """
+  def tempfile_for_image(data) do
     {:ok, tmp_path} = Plug.Upload.random_file("profile_pics")
-    :file.write_file(tmp_path, data, [:write, :raw, :exclusive, :binary])
+    {:ok, tmp_file} = File.open(tmp_path, [:write, :raw, :binary])
+    IO.binwrite(tmp_file, data)
+
     tmp_path
   end