Merge branch 'bugfix/csp-unproxied' into 'develop'

http_security_plug.ex: Fix non-proxied media

See merge request pleroma/pleroma!2610
This commit is contained in:
rinpatch 2020-05-29 21:23:49 +00:00
commit d23b3701d8

View file

@ -75,7 +75,7 @@ defp csp_string do
sources = get_proxy_and_attachment_sources() sources = get_proxy_and_attachment_sources()
{[img_src, sources], [media_src, sources]} {[img_src, sources], [media_src, sources]}
else else
{img_src, media_src} {[img_src, " https:"], [media_src, " https:"]}
end end
connect_src = ["connect-src 'self' blob: ", static_url, ?\s, websocket_url] connect_src = ["connect-src 'self' blob: ", static_url, ?\s, websocket_url]