diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-29 21:23:49 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-29 21:23:49 +0000 |
| commit | d23b3701d8f1341f3e4565d35ffa0c25b83af51d (patch) | |
| tree | 171d34c7057c347b7a99c095cae013cd6d8d45e4 | |
| parent | 32ba2b7f9f5a285e76160f0a1317fcaaae49e27e (diff) | |
| parent | 109af93227f65d308641e345c68c3884addb0181 (diff) | |
| download | pleroma-d23b3701d8f1341f3e4565d35ffa0c25b83af51d.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 41e3a31f4..6a339b32c 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' blob: ", static_url, ?\s, websocket_url] |