diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-06 13:22:02 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-06 13:22:02 +0000 |
| commit | 39b766cc43c39dbff84cb498c4b4c764abdec9a0 (patch) | |
| tree | aa05b64e8e256c6081fb546a2639290c29cf6f48 | |
| parent | 07f8c79a698e7ed139dec4adcefc0ae1ba680815 (diff) | |
| parent | fc37e5815f25d5669a944d216ffd3725e6a84c11 (diff) | |
| download | pleroma-39b766cc43c39dbff84cb498c4b4c764abdec9a0.tar.gz | |
Merge branch 'bugfix/connect-src-https' into 'develop'
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
See merge request pleroma/pleroma!900
| -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 = |