diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-03-05 01:44:24 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-03-05 01:44:24 +0100 |
| commit | fc37e5815f25d5669a944d216ffd3725e6a84c11 (patch) | |
| tree | d0fb7b653901e88abd1352602fd293078a8254da | |
| parent | 682cc94db11404ad658f566634c1e641cc575091 (diff) | |
| download | pleroma-fc37e5815f25d5669a944d216ffd3725e6a84c11.tar.gz | |
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
| -rw-r--r-- | lib/pleroma/plugs/http_security_plug.ex | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex index 057553e24..f701aaaa5 100644 --- a/lib/pleroma/plugs/http_security_plug.ex +++ b/lib/pleroma/plugs/http_security_plug.ex @@ -34,13 +34,16 @@ 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") + static_url = Pleroma.Web.Endpoint.static_url() + websocket_url = String.replace(static_url, "http", "ws") + + connect_src = "connect-src 'self' #{static_url} #{websocket_url}" connect_src = if Mix.env() == :dev do - "connect-src 'self' http://localhost:3035/ " <> websocket_url + connect_src <> " http://localhost:3035/" else - "connect-src 'self' " <> websocket_url + connect_src end script_src = |