Merge branch 'develop' into fix/csp-for-captcha

[akkoma] / lib / pleroma / plugs / http_security_plug.ex

diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex
index 3bf0b8ce72a641504c424ec93888a7f8184208be..472a3ff42e4869d1b8f2e6e347f2cc65cda4b89c 100644 (file)
--- a/lib/pleroma/plugs/http_security_plug.ex
+++ b/lib/pleroma/plugs/http_security_plug.ex
@@ -114,24 +114,15 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do
         add_source(acc, host)
       end)
 
-    media_proxy_base_url =
-      if Config.get([:media_proxy, :base_url]),
-        do: build_csp_param(Config.get([:media_proxy, :base_url]))
+    media_proxy_base_url = build_csp_param(Config.get([:media_proxy, :base_url]))
 
-    upload_base_url =
-      if Config.get([Pleroma.Upload, :base_url]),
-        do: build_csp_param(Config.get([Pleroma.Upload, :base_url]))
+    upload_base_url = build_csp_param(Config.get([Pleroma.Upload, :base_url]))
 
-    s3_endpoint =
-      if Config.get([Pleroma.Upload, :uploader]) == Pleroma.Uploaders.S3,
-        do: build_csp_param(Config.get([Pleroma.Uploaders.S3, :public_endpoint]))
+    s3_endpoint = build_csp_param(Config.get([Pleroma.Uploaders.S3, :public_endpoint]))
 
     captcha_method = Config.get([Pleroma.Captcha, :method])
 
-    captcha_endpoint =
-      if Config.get([Pleroma.Captcha, :enabled]) &&
-           captcha_method != "Pleroma.Captcha.Native",
-         do: build_csp_param(Config.get([captcha_method, :endpoint]))
+    captcha_endpoint = build_csp_param(Config.get([captcha_method, :endpoint]))
 
     []
     |> add_source(media_proxy_base_url)
@@ -148,11 +139,13 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do
 
   defp add_csp_param(csp_iodata, param), do: [[param, ?;] | csp_iodata]
 
+  defp build_csp_param(nil), do: nil
+
   defp build_csp_param(url) when is_binary(url) do
     %{host: host, scheme: scheme} = URI.parse(url)
 
     if scheme do
-      scheme <> "://" <> host
+      [scheme, "://", host]
     end
   end