Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 29 May 2020 09:46:31 +0000 (09:46 +0000)
committerrinpatch <rinpatch@sdf.org>
Sun, 7 Jun 2020 21:58:30 +0000 (00:58 +0300)
commita51284b60ab450a6c7ff644f1ea10f797a36aa59
tree770a75be94e1f88d5da5eedcf45bd820a1c2ae76
parenta5ccb5b0b1032b102c54d4df2e17c61423089e73
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'

Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596
lib/pleroma/plugs/http_security_plug.ex
test/plugs/http_security_plug_test.exs
test/web/media_proxy/media_proxy_test.exs