aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshibayashi <shibayashi@cypherpunk.observer>2019-02-12 00:08:52 +0100
committershibayashi <shibayashi@cypherpunk.observer>2019-02-12 00:08:52 +0100
commitea1058929c4dd569c00864f5292ec0a689acd1c6 (patch)
tree37aec478f075608de774e8e9c249b445336eebc0 /lib
parent39548c38243c6f37fb1f4a3d758b1bab662d7d7d (diff)
downloadpleroma-ea1058929c4dd569c00864f5292ec0a689acd1c6.tar.gz
Use url[:scheme] instead of protocol to determine if https is enabled
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/plugs/http_security_plug.ex4
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
]