mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2025-03-12 22:52:41 +00:00
AnonymizeFilename: Asyncify
This commit is contained in:
parent
5851d787b6
commit
ee291f08e8
4 changed files with 21 additions and 10 deletions
|
@ -159,6 +159,9 @@ config :pleroma, Pleroma.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMoc
|
||||||
config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock
|
config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock
|
||||||
config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, config_impl: Pleroma.StaticStubbedConfigMock
|
config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, config_impl: Pleroma.StaticStubbedConfigMock
|
||||||
|
|
||||||
|
config :pleroma, Pleroma.Upload.Filter.AnonymizeFilename,
|
||||||
|
config_impl: Pleroma.StaticStubbedConfigMock
|
||||||
|
|
||||||
config :pleroma, Pleroma.Signature, http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock
|
config :pleroma, Pleroma.Signature, http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock
|
||||||
|
|
||||||
peer_module =
|
peer_module =
|
||||||
|
|
|
@ -10,7 +10,7 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilename do
|
||||||
"""
|
"""
|
||||||
@behaviour Pleroma.Upload.Filter
|
@behaviour Pleroma.Upload.Filter
|
||||||
|
|
||||||
alias Pleroma.Config
|
@config_impl Application.compile_env(:pleroma, [__MODULE__, :config_impl], Pleroma.Config)
|
||||||
alias Pleroma.Upload
|
alias Pleroma.Upload
|
||||||
|
|
||||||
def filter(%Upload{name: name} = upload) do
|
def filter(%Upload{name: name} = upload) do
|
||||||
|
@ -23,7 +23,7 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilename do
|
||||||
|
|
||||||
@spec predefined_name(String.t()) :: String.t() | nil
|
@spec predefined_name(String.t()) :: String.t() | nil
|
||||||
defp predefined_name(extension) do
|
defp predefined_name(extension) do
|
||||||
with name when not is_nil(name) <- Config.get([__MODULE__, :text]),
|
with name when not is_nil(name) <- @config_impl.get([__MODULE__, :text]),
|
||||||
do: String.replace(name, "{extension}", extension)
|
do: String.replace(name, "{extension}", extension)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,11 @@
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do
|
defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase, async: true
|
||||||
|
|
||||||
|
import Mox
|
||||||
alias Pleroma.Upload
|
alias Pleroma.Upload
|
||||||
|
alias Pleroma.StaticStubbedConfigMock, as: ConfigMock
|
||||||
|
|
||||||
setup do
|
setup do
|
||||||
File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
|
File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
|
||||||
|
@ -19,21 +21,26 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do
|
||||||
%{upload_file: upload_file}
|
%{upload_file: upload_file}
|
||||||
end
|
end
|
||||||
|
|
||||||
setup do: clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text])
|
|
||||||
|
|
||||||
test "it replaces filename on pre-defined text", %{upload_file: upload_file} do
|
test "it replaces filename on pre-defined text", %{upload_file: upload_file} do
|
||||||
clear_config([Upload.Filter.AnonymizeFilename, :text], "custom-file.png")
|
ConfigMock
|
||||||
|
|> stub(:get, fn [Upload.Filter.AnonymizeFilename, :text] -> "custom-file.png" end)
|
||||||
|
|
||||||
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
|
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
|
||||||
assert name == "custom-file.png"
|
assert name == "custom-file.png"
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it replaces filename on pre-defined text expression", %{upload_file: upload_file} do
|
test "it replaces filename on pre-defined text expression", %{upload_file: upload_file} do
|
||||||
clear_config([Upload.Filter.AnonymizeFilename, :text], "custom-file.{extension}")
|
ConfigMock
|
||||||
|
|> stub(:get, fn [Upload.Filter.AnonymizeFilename, :text] -> "custom-file.{extension}" end)
|
||||||
|
|
||||||
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
|
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
|
||||||
assert name == "custom-file.jpg"
|
assert name == "custom-file.jpg"
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it replaces filename on random text", %{upload_file: upload_file} do
|
test "it replaces filename on random text", %{upload_file: upload_file} do
|
||||||
|
ConfigMock
|
||||||
|
|> stub(:get, fn [Upload.Filter.AnonymizeFilename, :text] -> nil end)
|
||||||
|
|
||||||
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
|
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
|
||||||
assert <<_::bytes-size(14)>> <> ".jpg" = name
|
assert <<_::bytes-size(14)>> <> ".jpg" = name
|
||||||
refute name == "an… image.jpg"
|
refute name == "an… image.jpg"
|
||||||
|
|
|
@ -5,12 +5,13 @@
|
||||||
defmodule Pleroma.Upload.FilterTest do
|
defmodule Pleroma.Upload.FilterTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase
|
||||||
|
|
||||||
|
import Mox
|
||||||
alias Pleroma.Upload.Filter
|
alias Pleroma.Upload.Filter
|
||||||
|
alias Pleroma.StaticStubbedConfigMock, as: ConfigMock
|
||||||
setup do: clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text])
|
|
||||||
|
|
||||||
test "applies filters" do
|
test "applies filters" do
|
||||||
clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text], "custom-file.png")
|
ConfigMock
|
||||||
|
|> stub(:get, fn [Pleroma.Upload.Filter.AnonymizeFilename, :text] -> "custom-file.png" end)
|
||||||
|
|
||||||
File.cp!(
|
File.cp!(
|
||||||
"test/fixtures/image.jpg",
|
"test/fixtures/image.jpg",
|
||||||
|
|
Loading…
Reference in a new issue