projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CI: Fix the broken tasks.
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
uploaded_media.ex
diff --git
a/lib/pleroma/web/plugs/uploaded_media.ex
b/lib/pleroma/web/plugs/uploaded_media.ex
index 402a8bb34c3d4b71f2decde632902601227c7041..2378e98d2e63669080d82a0231f9a9651b855c5c 100644
(file)
--- a/
lib/pleroma/web/plugs/uploaded_media.ex
+++ b/
lib/pleroma/web/plugs/uploaded_media.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.UploadedMedia do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.UploadedMedia do
@@
-62,7
+62,7
@@
defmodule Pleroma.Web.Plugs.UploadedMedia do
def call(conn, _opts), do: conn
defp media_is_banned(%{request_path: path} = _conn, {:static_dir, _}) do
def call(conn, _opts), do: conn
defp media_is_banned(%{request_path: path} = _conn, {:static_dir, _}) do
- MediaProxy.in_banned_urls(Pleroma.
Web
.base_url() <> path)
+ MediaProxy.in_banned_urls(Pleroma.
Upload
.base_url() <> path)
end
defp media_is_banned(_, {:url, url}), do: MediaProxy.in_banned_urls(url)
end
defp media_is_banned(_, {:url, url}), do: MediaProxy.in_banned_urls(url)
@@
-87,8
+87,15
@@
defmodule Pleroma.Web.Plugs.UploadedMedia do
end
defp get_media(conn, {:url, url}, true, _) do
end
defp get_media(conn, {:url, url}, true, _) do
+ proxy_opts = [
+ http: [
+ follow_redirect: true,
+ pool: :upload
+ ]
+ ]
+
conn
conn
- |> Pleroma.ReverseProxy.call(url,
Pleroma.Config.get([Pleroma.Upload, :proxy_opts], [])
)
+ |> Pleroma.ReverseProxy.call(url,
proxy_opts
)
end
defp get_media(conn, {:url, url}, _, _) do
end
defp get_media(conn, {:url, url}, _, _) do