diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-02-12 02:44:23 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-02-12 02:44:23 +0000 |
| commit | c71b3a1b124f5dba23ebe812289868aa4983d8a8 (patch) | |
| tree | 32769f5b51391f2a32c1d8c954754c253a3dfce2 | |
| parent | e1983fca8d3fa7859bf065ec8e1f6c65da085788 (diff) | |
| parent | ea1058929c4dd569c00864f5292ec0a689acd1c6 (diff) | |
| download | pleroma-c71b3a1b124f5dba23ebe812289868aa4983d8a8.tar.gz pleroma-c71b3a1b124f5dba23ebe812289868aa4983d8a8.zip | |
Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'
Fix CSP check for 'upgrade-insecure-requests'
See merge request pleroma/pleroma!814
| -rw-r--r-- | lib/pleroma/plugs/http_security_plug.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex index 2a266c407..3c8e6a18f 100644 --- a/lib/pleroma/plugs/http_security_plug.ex +++ b/lib/pleroma/plugs/http_security_plug.ex @@ -33,7 +33,7 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do end defp csp_string do - protocol = Config.get([Pleroma.Web.Endpoint, :protocol]) + scheme = Config.get([Pleroma.Web.Endpoint, :url])[:scheme] [ "default-src 'none'", @@ -46,7 +46,7 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do "script-src 'self'", "connect-src 'self' " <> String.replace(Pleroma.Web.Endpoint.static_url(), "http", "ws"), "manifest-src 'self'", - if protocol == "https" do + if scheme == "https" do "upgrade-insecure-requests" end ] |