Merge branch 'uploads-csp-changes' into 'develop'

Uploads: Sandbox them in the CSP. See merge request pleroma/pleroma!2389
4 years ago · ad8630b95a
parent 96eae62995 6bc76df287
commit ad8630b95a
1 changed files with 1 additions and 0 deletions
--- a/lib/pleroma/plugs/uploaded_media.ex
+++ b/lib/pleroma/plugs/uploaded_media.ex
@ -41,6 +41,7 @@ defmodule Pleroma.Plugs.UploadedMedia do
        conn ->
          conn
      end
      |> merge_resp_headers([{"content-security-policy", "sandbox"}])
    config = Pleroma.Config.get(Pleroma.Upload)