From fa483cd7c211ba7d755d307f095bde31efdb81d4 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Mon, 29 Oct 2018 16:29:46 +0000
Subject: [PATCH] upload: add new optional argument designating an upload size
limit
---
lib/pleroma/upload.ex | 107 ++++++++++++++++++++++++------------------
1 file changed, 61 insertions(+), 46 deletions(-)
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index f188a5f32..2293ff54e 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -4,61 +4,76 @@ defmodule Pleroma.Upload do
@storage_backend Application.get_env(:pleroma, Pleroma.Upload)
|> Keyword.fetch!(:uploader)
- def store(%Plug.Upload{} = file, should_dedupe) do
- content_type = get_content_type(file.path)
+ def check_file_size(path, nil), do: true
- uuid = get_uuid(file, should_dedupe)
- name = get_name(file, uuid, content_type, should_dedupe)
-
- strip_exif_data(content_type, file.path)
-
- {:ok, url_path} =
- @storage_backend.put_file(name, uuid, file.path, content_type, should_dedupe)
-
- %{
- "type" => "Document",
- "url" => [
- %{
- "type" => "Link",
- "mediaType" => content_type,
- "href" => url_path
- }
- ],
- "name" => name
- }
+ def check_file_size(path, size_limit) do
+ {:ok, %{size: size}} = File.stat(path)
+ size <= size_limit
end
- def store(%{"img" => "data:image/" <> image_data}, should_dedupe) do
+ def store(file, should_dedupe, size_limit \\ nil)
+
+ def store(%Plug.Upload{} = file, should_dedupe, size_limit) do
+ content_type = get_content_type(file.path)
+
+ with uuid <- get_uuid(file, should_dedupe),
+ name <- get_name(file, uuid, content_type, should_dedupe),
+ true <- check_file_size(file.path, size_limit) do
+ strip_exif_data(content_type, file.path)
+
+ {:ok, url_path} =
+ @storage_backend.put_file(name, uuid, file.path, content_type, should_dedupe)
+
+ %{
+ "type" => "Document",
+ "url" => [
+ %{
+ "type" => "Link",
+ "mediaType" => content_type,
+ "href" => url_path
+ }
+ ],
+ "name" => name
+ }
+ else
+ _e -> nil
+ end
+ end
+
+ def store(%{"img" => "data:image/" <> image_data}, should_dedupe, size_limit) do
parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
data = Base.decode64!(parsed["data"], ignore: :whitespace)
- tmp_path = tempfile_for_image(data)
+ with tmp_path <- tempfile_for_image(data),
+ uuid <- UUID.generate(),
+ true <- check_file_size(tmp_path, size_limit) do
+ content_type = get_content_type(tmp_path)
+ strip_exif_data(content_type, tmp_path)
- uuid = UUID.generate()
+ name =
+ create_name(
+ String.downcase(Base.encode16(:crypto.hash(:sha256, data))),
+ parsed["filetype"],
+ content_type
+ )
- content_type = get_content_type(tmp_path)
- strip_exif_data(content_type, tmp_path)
+ {:ok, url_path} =
+ @storage_backend.put_file(name, uuid, tmp_path, content_type, should_dedupe)
- name =
- create_name(
- String.downcase(Base.encode16(:crypto.hash(:sha256, data))),
- parsed["filetype"],
- content_type
- )
-
- {:ok, url_path} = @storage_backend.put_file(name, uuid, tmp_path, content_type, should_dedupe)
-
- %{
- "type" => "Image",
- "url" => [
- %{
- "type" => "Link",
- "mediaType" => content_type,
- "href" => url_path
- }
- ],
- "name" => name
- }
+ %{
+ "type" => "Image",
+ "url" => [
+ %{
+ "type" => "Link",
+ "mediaType" => content_type,
+ "href" => url_path
+ }
+ ],
+ "name" => name
+ }
+ else
+ _e -> nil
+ end
end
@doc """