From 9598137d3293ccc524a82dd4a8993328c6d23f6f Mon Sep 17 00:00:00 2001 From: Oneric Date: Sun, 7 Apr 2024 00:06:29 +0200 Subject: [PATCH] Drop base_url special casing in test env 61621ebdbc5b783fbba7f37559030f7a8e151d53 already explicitly added the uploader base url to config/test.exs and it reduces differences from prod. --- config/test.exs | 2 + lib/pleroma/upload.ex | 13 +------ lib/pleroma/web/media_proxy.ex | 12 +----- .../web/plugs/http_security_plug_test.exs | 39 +++++++++++++------ 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/config/test.exs b/config/test.exs index 97d005eab..75751e115 100644 --- a/config/test.exs +++ b/config/test.exs @@ -26,6 +26,8 @@ filters: [], link_name: false +config :pleroma, :media_proxy, base_url: "http://localhost:4001" + config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test, enabled: true diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index 1158e9449..b6a32d87a 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -39,8 +39,6 @@ defmodule Pleroma.Upload do alias Pleroma.Web.ActivityPub.Utils require Logger - @mix_env Mix.env() - @type source :: Plug.Upload.t() | (data_uri_string :: String.t()) @@ -230,13 +228,6 @@ defp url_from_spec(%__MODULE__{name: name}, base_url, {:file, path}) do defp url_from_spec(_upload, _base_url, {:url, url}), do: url - if @mix_env == :test do - defp choose_base_url(prim, sec \\ nil), - do: prim || sec || Pleroma.Web.Endpoint.url() <> "/media/" - else - defp choose_base_url(prim, sec \\ nil), do: prim || sec - end - def base_url do uploader = Config.get([Pleroma.Upload, :uploader]) upload_base_url = Config.get([Pleroma.Upload, :base_url]) @@ -244,7 +235,7 @@ def base_url do case uploader do Pleroma.Uploaders.Local -> - choose_base_url(upload_base_url) + upload_base_url Pleroma.Uploaders.S3 -> bucket = Config.get([Pleroma.Uploaders.S3, :bucket]) @@ -270,7 +261,7 @@ def base_url do end _ -> - choose_base_url(public_endpoint, upload_base_url) + public_endpoint || upload_base_url end end end diff --git a/lib/pleroma/web/media_proxy.ex b/lib/pleroma/web/media_proxy.ex index 19411d58e..61b6f2a62 100644 --- a/lib/pleroma/web/media_proxy.ex +++ b/lib/pleroma/web/media_proxy.ex @@ -14,8 +14,6 @@ defmodule Pleroma.Web.MediaProxy do @cachex Pleroma.Config.get([:cachex, :provider], Cachex) - @mix_env Mix.env() - def cache_table, do: @cache_table @spec in_banned_urls(String.t()) :: boolean() @@ -146,14 +144,8 @@ def filename(url_or_path) do if path = URI.parse(url_or_path).path, do: Path.basename(path) end - if @mix_env == :test do - def base_url do - Config.get([:media_proxy, :base_url], Endpoint.url()) - end - else - def base_url do - Config.get!([:media_proxy, :base_url]) - end + def base_url do + Config.get!([:media_proxy, :base_url]) end defp proxy_url(path, sig_base64, url_base64, filename) do diff --git a/test/pleroma/web/plugs/http_security_plug_test.exs b/test/pleroma/web/plugs/http_security_plug_test.exs index bd8207ae0..009fb829c 100644 --- a/test/pleroma/web/plugs/http_security_plug_test.exs +++ b/test/pleroma/web/plugs/http_security_plug_test.exs @@ -7,8 +7,6 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlugTest do alias Plug.Conn - setup_all do: clear_config([Pleroma.Upload, :base_url], nil) - describe "http security enabled" do setup do: clear_config([:http_security, :enabled], true) @@ -98,51 +96,68 @@ test "it sets the Service-Worker-Allowed header", %{conn: conn} do test "media_proxy with base_url", %{conn: conn} do url = "https://example.com" clear_config([:media_proxy, :base_url], url) - assert_media_img_src(conn, url) + assert_media_img_src(conn, proxy: url) assert_connect_src(conn, url) end test "upload with base url", %{conn: conn} do url = "https://example2.com" clear_config([Pleroma.Upload, :base_url], url) - assert_media_img_src(conn, url) + assert_media_img_src(conn, upload: url) assert_connect_src(conn, url) end test "with S3 public endpoint", %{conn: conn} do url = "https://example3.com" clear_config([Pleroma.Uploaders.S3, :public_endpoint], url) - assert_media_img_src(conn, url) + assert_media_img_src(conn, s3: url) end test "with captcha endpoint", %{conn: conn} do clear_config([Pleroma.Captcha.Mock, :endpoint], "https://captcha.com") - assert_media_img_src(conn, "https://captcha.com") + assert_media_img_src(conn, captcha: "https://captcha.com") end test "with media_proxy whitelist", %{conn: conn} do clear_config([:media_proxy, :whitelist], ["https://example6.com", "https://example7.com"]) - assert_media_img_src(conn, "https://example7.com https://example6.com") + assert_media_img_src(conn, proxy_whitelist: "https://example7.com https://example6.com") end # TODO: delete after removing support bare domains for media proxy whitelist test "with media_proxy bare domains whitelist (deprecated)", %{conn: conn} do clear_config([:media_proxy, :whitelist], ["example4.com", "example5.com"]) - assert_media_img_src(conn, "example5.com example4.com") + assert_media_img_src(conn, proxy_whitelist: "example5.com example4.com") end test "with media_proxy blocklist", %{conn: conn} do clear_config([:media_proxy, :whitelist], ["https://example6.com", "https://example7.com"]) clear_config([:media_proxy, :blocklist], ["https://example8.com"]) - assert_media_img_src(conn, "https://example7.com https://example6.com") + assert_media_img_src(conn, proxy_whitelist: "https://example7.com https://example6.com") end end - defp assert_media_img_src(conn, url) do + defp maybe_concat(nil, b), do: b + defp maybe_concat(a, nil), do: a + defp maybe_concat(a, b), do: a <> " " <> b + + defp build_src_str(urls) do + urls[:proxy_whitelist] + |> maybe_concat(urls[:s3]) + |> maybe_concat(urls[:upload]) + |> maybe_concat(urls[:proxy]) + |> maybe_concat(urls[:captcha]) + end + + defp assert_media_img_src(conn, urls) do + urlstr = + [upload: "http://localhost", proxy: "http://localhost"] + |> Keyword.merge(urls) + |> build_src_str() + conn = get(conn, "/api/v1/instance") [csp] = Conn.get_resp_header(conn, "content-security-policy") - assert csp =~ "media-src 'self' #{url};" - assert csp =~ "img-src 'self' data: blob: #{url};" + assert csp =~ "media-src 'self' #{urlstr};" + assert csp =~ "img-src 'self' data: blob: #{urlstr};" end defp assert_connect_src(conn, url) do