X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fhttp_security_plug.ex;h=a476f1d49ab2ed02e98b0a1aba677b37f845a541;hb=7b8dc99ef106314f1418ff1c314b47cf58a3c2d2;hp=05e935f2c5b434ad8ebd12c02f69b89155993567;hpb=00e8f0b07dd3dced84b0317e1c5c4156d249dec4;p=akkoma

diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex
index 05e935f2c..a476f1d49 100644
--- a/lib/pleroma/plugs/http_security_plug.ex
+++ b/lib/pleroma/plugs/http_security_plug.ex
@@ -34,6 +34,24 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do
 
   defp csp_string do
     scheme = Config.get([Pleroma.Web.Endpoint, :url])[:scheme]
+    static_url = Pleroma.Web.Endpoint.static_url()
+    websocket_url = Pleroma.Web.Endpoint.websocket_url()
+
+    connect_src = "connect-src 'self' #{static_url} #{websocket_url}"
+
+    connect_src =
+      if Mix.env() == :dev do
+        connect_src <> " http://localhost:3035/"
+      else
+        connect_src
+      end
+
+    script_src =
+      if Mix.env() == :dev do
+        "script-src 'self' 'unsafe-eval'"
+      else
+        "script-src 'self'"
+      end
 
     [
       "default-src 'none'",
@@ -43,11 +61,9 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do
       "media-src 'self' https:",
       "style-src 'self' 'unsafe-inline'",
       "font-src 'self'",
-      "connect-src 'self' " <> String.replace(Pleroma.Web.Endpoint.static_url(), "http", "ws"),
       "manifest-src 'self'",
-      if Mix.env() == :dev do
-        "script-src 'self' 'unsafe-eval'"
-      end,
+      connect_src,
+      script_src,
       if scheme == "https" do
         "upgrade-insecure-requests"
       end