diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-29 21:23:49 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-06-12 20:43:36 +0300 |
| commit | cd2df734dde6151faa6a73edb296a5cf768e9a34 (patch) | |
| tree | 0c9a007b1088d0bc565384170d39ec38359b5870 | |
| parent | e313aa0977fc6023067d6580b36a7dc71a4d1b5a (diff) | |
| download | pleroma-cd2df734dde6151faa6a73edb296a5cf768e9a34.tar.gz | |
Merge branch 'bugfix/csp-unproxied' into 'develop'
http_security_plug.ex: Fix non-proxied media
See merge request pleroma/pleroma!2610
| -rw-r--r-- | lib/pleroma/plugs/http_security_plug.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex index 2208d1d6c..589072535 100644 --- a/lib/pleroma/plugs/http_security_plug.ex +++ b/lib/pleroma/plugs/http_security_plug.ex @@ -75,7 +75,7 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do sources = get_proxy_and_attachment_sources() {[img_src, sources], [media_src, sources]} else - {img_src, media_src} + {[img_src, " https:"], [media_src, " https:"]} end connect_src = ["connect-src 'self' ", static_url, ?\s, websocket_url] |