diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-05-26 17:12:18 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-05-26 17:12:18 +0000 |
| commit | 47e66c950090c7be4bbd99303c33d7b5c0422ad0 (patch) | |
| tree | 348c7672584d44fa028ed1fb61a2478714a56c2f /lib | |
| parent | 5433742faf0acfe759799c1b7907b1aff44ecaf3 (diff) | |
| parent | 38bcf6b19e3d83cb6c4e6c82d237a26edcab167a (diff) | |
| download | pleroma-47e66c950090c7be4bbd99303c33d7b5c0422ad0.tar.gz pleroma-47e66c950090c7be4bbd99303c33d7b5c0422ad0.zip | |
Merge branch 'issue/3126' into 'develop'
MediaProxyController: Apply CSP sandbox
See merge request pleroma/pleroma!3890
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy_controller.ex | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex index d2ad62c13..bda5b36ed 100644 --- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex +++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex @@ -12,6 +12,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do alias Pleroma.Web.MediaProxy alias Plug.Conn + plug(:sandbox) + def remote(conn, %{"sig" => sig64, "url" => url64}) do with {_, true} <- {:enabled, MediaProxy.enabled?()}, {:ok, url} <- MediaProxy.decode_url(sig64, url64), @@ -202,4 +204,9 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do defp media_proxy_opts do Config.get([:media_proxy, :proxy_opts], []) end + + defp sandbox(conn, _params) do + conn + |> merge_resp_headers([{"content-security-policy", "sandbox;"}]) + end end |