From: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sat, 2 Feb 2019 18:06:26 +0000 (+0100)
Subject: Plugs.HTTPSecurityPlug: Add webpacker to connect-src
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=da4c662af31a2c45c767f2a9ed136272ee9fc2c8;p=akkoma

Plugs.HTTPSecurityPlug: Add webpacker to connect-src
---

diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex
index 05e935f2c..057553e24 100644
--- a/lib/pleroma/plugs/http_security_plug.ex
+++ b/lib/pleroma/plugs/http_security_plug.ex
@@ -34,6 +34,21 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do
 
   defp csp_string do
     scheme = Config.get([Pleroma.Web.Endpoint, :url])[:scheme]
+    websocket_url = String.replace(Pleroma.Web.Endpoint.static_url(), "http", "ws")
+
+    connect_src =
+      if Mix.env() == :dev do
+        "connect-src 'self' http://localhost:3035/ " <> websocket_url
+      else
+        "connect-src 'self' " <> websocket_url
+      end
+
+    script_src =
+      if Mix.env() == :dev do
+        "script-src 'self' 'unsafe-eval'"
+      else
+        "script-src 'self'"
+      end
 
     [
       "default-src 'none'",
@@ -43,11 +58,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