summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2021-12-30 16:53:47 +0000
committerMark Felder <feld@feld.me>2022-12-20 09:55:04 -0500
commit108d917b617a76cda4374868cc86c24d73d98006 (patch)
tree2afef4e83f48ebcffbba3d776c616cbabf81ef5e
parent608c964220c362c5f26df88a3a958cced7a2dc58 (diff)
Remove the Hackney follow_redirect
Change the get_media/4 to get_media/3 as we don't need to special case following redirects anymore and we probably should have always been following redirects anyway
-rw-r--r--config/config.exs3
-rw-r--r--lib/pleroma/web/plugs/uploaded_media.ex20
2 files changed, 4 insertions, 19 deletions
diff --git a/config/config.exs b/config/config.exs
index 273027938..fc83e1db3 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -434,9 +434,6 @@ config :pleroma, :media_proxy,
max_body_length: 25 * 1_048_576,
# Note: max_read_duration defaults to Pleroma.ReverseProxy.max_read_duration_default/1
max_read_duration: 30_000,
- http: [
- follow_redirect: true
- ]
],
whitelist: []
diff --git a/lib/pleroma/web/plugs/uploaded_media.ex b/lib/pleroma/web/plugs/uploaded_media.ex
index 3af4f93dc..c29229052 100644
--- a/lib/pleroma/web/plugs/uploaded_media.ex
+++ b/lib/pleroma/web/plugs/uploaded_media.ex
@@ -47,10 +47,9 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do
config = Pleroma.Config.get(Pleroma.Upload)
with uploader <- Keyword.fetch!(config, :uploader),
- proxy_remote = Keyword.get(config, :proxy_remote, false),
{:ok, get_method} <- uploader.get_file(file),
false <- media_is_banned(conn, get_method) do
- get_media(conn, get_method, proxy_remote, opts)
+ get_media(conn, get_method, opts)
else
_ ->
conn
@@ -69,7 +68,7 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do
defp media_is_banned(_, _), do: false
- defp get_media(conn, {:static_dir, directory}, _, opts) do
+ defp get_media(conn, {:static_dir, directory}, opts) do
static_opts =
Map.get(opts, :static_plug_opts)
|> Map.put(:at, [@path])
@@ -86,24 +85,13 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do
end
end
- defp get_media(conn, {:url, url}, true, _) do
- proxy_opts = [
- http: [
- follow_redirect: true
- ]
- ]
-
- conn
- |> Pleroma.ReverseProxy.call(url, proxy_opts)
- end
-
- defp get_media(conn, {:url, url}, _, _) do
+ defp get_media(conn, {:url, url}, _) do
conn
|> Phoenix.Controller.redirect(external: url)
|> halt()
end
- defp get_media(conn, unknown, _, _) do
+ defp get_media(conn, unknown, _) do
Logger.error("#{__MODULE__}: Unknown get startegy: #{inspect(unknown)}")
conn