diff options
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy_controller.ex | 3 | ||||
| -rw-r--r-- | test/gun/connections_test.exs | 4 | ||||
| -rw-r--r-- | test/reverse_proxy/reverse_proxy_test.exs | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex index 7d285a549..8403850ff 100644 --- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex +++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex @@ -13,9 +13,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do with config <- Pleroma.Config.get([:media_proxy], []), true <- Keyword.get(config, :enabled, false), {:ok, url} <- MediaProxy.decode_url(sig64, url64), - IO.inspect(sig64), - IO.inspect(url64), - IO.inspect(url), :ok <- filename_matches(params, conn.request_path, url) do ReverseProxy.call(conn, url, Keyword.get(config, :proxy_opts, @default_proxy_opts)) else diff --git a/test/gun/connections_test.exs b/test/gun/connections_test.exs index aad70a644..a63c8eaf9 100644 --- a/test/gun/connections_test.exs +++ b/test/gun/connections_test.exs @@ -180,7 +180,7 @@ defmodule Gun.ConnectionsTest do test "opens connection and reuse it on next request", %{name: name} do api = Pleroma.Config.get([API]) - Pleroma.Config.put([API], :gun) + Pleroma.Config.put([API], API.Gun) on_exit(fn -> Pleroma.Config.put([API], api) end) conn = Connections.get_conn("http://httpbin.org", [], name) @@ -204,7 +204,7 @@ defmodule Gun.ConnectionsTest do test "opens ssl connection and reuse it on next request", %{name: name} do api = Pleroma.Config.get([API]) - Pleroma.Config.put([API], :gun) + Pleroma.Config.put([API], API.Gun) on_exit(fn -> Pleroma.Config.put([API], api) end) conn = Connections.get_conn("https://httpbin.org", [], name) diff --git a/test/reverse_proxy/reverse_proxy_test.exs b/test/reverse_proxy/reverse_proxy_test.exs index cd65163d1..476cff643 100644 --- a/test/reverse_proxy/reverse_proxy_test.exs +++ b/test/reverse_proxy/reverse_proxy_test.exs @@ -355,7 +355,7 @@ defmodule Pleroma.ReverseProxyTest do Application.put_env(:tesla, :adapter, Tesla.Adapter.Gun) api = Pleroma.Config.get([Pleroma.Gun.API]) - Pleroma.Config.put([Pleroma.Gun.API], :gun) + Pleroma.Config.put([Pleroma.Gun.API], Pleroma.Gun.API.Gun) {:ok, _} = Pleroma.Gun.Connections.start_link(Pleroma.Gun.Connections) conn = ReverseProxy.call(conn, "http://httpbin.org/stream-bytes/10") @@ -378,7 +378,7 @@ defmodule Pleroma.ReverseProxyTest do Application.put_env(:tesla, :adapter, Tesla.Adapter.Gun) api = Pleroma.Config.get([Pleroma.Gun.API]) - Pleroma.Config.put([Pleroma.Gun.API], :gun) + Pleroma.Config.put([Pleroma.Gun.API], Pleroma.Gun.API.Gun) {:ok, _} = Pleroma.Gun.Connections.start_link(Pleroma.Gun.Connections) conn = ReverseProxy.call(conn, "https://httpbin.org/stream-bytes/10") @@ -401,7 +401,7 @@ defmodule Pleroma.ReverseProxyTest do Application.put_env(:tesla, :adapter, Tesla.Adapter.Gun) api = Pleroma.Config.get([Pleroma.Gun.API]) - Pleroma.Config.put([Pleroma.Gun.API], :gun) + Pleroma.Config.put([Pleroma.Gun.API], Pleroma.Gun.API.Gun) {:ok, _} = Pleroma.Gun.Connections.start_link(Pleroma.Gun.Connections) conn = ReverseProxy.call(conn, "https://httpbin.org/redirect/5") |