diff options
| author | feld <feld@feld.me> | 2020-06-11 16:18:06 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-06-11 16:18:06 +0000 |
| commit | 5474b5c988d3ab8869217b72d3702fb9396adadf (patch) | |
| tree | e76e1d1bea5ee477d1d946fb8ac7534f8d9195ff | |
| parent | 5d6ec6e5fc9b00d367568dd111816b90cddad02b (diff) | |
| parent | 7f7a1a467677471e0e1ec688e4eca9ba759d976a (diff) | |
| download | pleroma-5474b5c988d3ab8869217b72d3702fb9396adadf.tar.gz pleroma-5474b5c988d3ab8869217b72d3702fb9396adadf.zip | |
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'
HTTP security plug: add media proxy base url host to csp
See merge request pleroma/pleroma!2638
| -rw-r--r-- | lib/pleroma/plugs/http_security_plug.ex | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex index 6a339b32c..1420a9611 100644 --- a/lib/pleroma/plugs/http_security_plug.ex +++ b/lib/pleroma/plugs/http_security_plug.ex @@ -113,6 +113,10 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do add_source(acc, host) end) + media_proxy_base_url = + if Config.get([:media_proxy, :base_url]), + do: URI.parse(Config.get([:media_proxy, :base_url])).host + upload_base_url = if Config.get([Pleroma.Upload, :base_url]), do: URI.parse(Config.get([Pleroma.Upload, :base_url])).host @@ -122,6 +126,7 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do do: URI.parse(Config.get([Pleroma.Uploaders.S3, :public_endpoint])).host [] + |> add_source(media_proxy_base_url) |> add_source(upload_base_url) |> add_source(s3_endpoint) |> add_source(media_proxy_whitelist) |