Ensure Gun is Gone

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf5513fbb3c00c5bc50c970e515a8443c018f753..f1dd50ddc2cc3b52b06be1d695375e3250938a00 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Unreleased
+
+## Removed
+- Non-finch HTTP adapters
+
+## Upgrade notes
+- Ensure `config :tesla, :adapter` is either unset, or set to `{Tesla.Adapter.Finch, name: MyFinch}` in your .exs config
+
 ## 2022.12
 
 ## Added

diff --git a/lib/pleroma/frontend.ex b/lib/pleroma/frontend.ex
index adda71eef1f989ce0931c4d62789afa5c6e42cbf..dc9d55646c9a949e206a57a78ccfda39f6ca0918 100644 (file)
--- a/lib/pleroma/frontend.ex
+++ b/lib/pleroma/frontend.ex
@@ -93,7 +93,7 @@ defmodule Pleroma.Frontend do
     url = String.replace(frontend_info["build_url"], "${ref}", frontend_info["ref"])
 
     with {:ok, %{status: 200, body: zip_body}} <-
-           Pleroma.HTTP.get(url, [], recv_timeout: 120_000) do
+           Pleroma.HTTP.get(url, [], receive_timeout: 120_000) do
       unzip(zip_body, dest)
     else
       {:error, e} -> {:error, e}

diff --git a/lib/pleroma/gun.ex b/lib/pleroma/gun.ex
deleted file mode 100644 (file)
index bef1c98..0000000
--- a/lib/pleroma/gun.ex
+++ /dev/null
@@ -1,29 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Gun do
-  @callback open(charlist(), pos_integer(), map()) :: {:ok, pid()}
-  @callback info(pid()) :: map()
-  @callback close(pid()) :: :ok
-  @callback await_up(pid, pos_integer()) :: {:ok, atom()} | {:error, atom()}
-  @callback connect(pid(), map()) :: reference()
-  @callback await(pid(), reference()) :: {:response, :fin, 200, []}
-  @callback set_owner(pid(), pid()) :: :ok
-
-  defp api, do: Pleroma.Config.get([Pleroma.Gun], Pleroma.Gun.API)
-
-  def open(host, port, opts), do: api().open(host, port, opts)
-
-  def info(pid), do: api().info(pid)
-
-  def close(pid), do: api().close(pid)
-
-  def await_up(pid, timeout \\ 5_000), do: api().await_up(pid, timeout)
-
-  def connect(pid, opts), do: api().connect(pid, opts)
-
-  def await(pid, ref), do: api().await(pid, ref)
-
-  def set_owner(pid, owner), do: api().set_owner(pid, owner)
-end

diff --git a/lib/pleroma/reverse_proxy/client/tesla.ex b/lib/pleroma/reverse_proxy/client/tesla.ex
index 36a0a2060959257a4e3e7a662e6a8beec271add2..b21dc90365740e1a1a5a45c8210cee4028df1f90 100644 (file)
--- a/lib/pleroma/reverse_proxy/client/tesla.ex
+++ b/lib/pleroma/reverse_proxy/client/tesla.ex
@@ -5,8 +5,6 @@
 defmodule Pleroma.ReverseProxy.Client.Tesla do
   @behaviour Pleroma.ReverseProxy.Client
 
-  alias Pleroma.Gun.ConnectionPool
-
   @type headers() :: [{String.t(), String.t()}]
   @type status() :: pos_integer()
 
@@ -77,10 +75,6 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do
   defp check_adapter do
     adapter = Application.get_env(:tesla, :adapter)
 
-    unless adapter == Tesla.Adapter.Gun do
-      raise "#{adapter} doesn't support reading body in chunks"
-    end
-
     adapter
   end
 end

diff --git a/lib/pleroma/reverse_proxy/client/wrapper.ex b/lib/pleroma/reverse_proxy/client/wrapper.ex
index ce144559f6dc70945b55dbcadb14843d2d71dfb4..b9a05ce111726d5df38035b82b50ab9fa192ffd5 100644 (file)
--- a/lib/pleroma/reverse_proxy/client/wrapper.ex
+++ b/lib/pleroma/reverse_proxy/client/wrapper.ex
@@ -23,8 +23,6 @@ defmodule Pleroma.ReverseProxy.Client.Wrapper do
     |> client()
   end
 
-  defp client(Tesla.Adapter.Hackney), do: Pleroma.ReverseProxy.Client.Hackney
-  defp client(Tesla.Adapter.Gun), do: Pleroma.ReverseProxy.Client.Tesla
-  defp client({Tesla.Adapter.Finch, _}), do: Pleroma.ReverseProxy.Client.Hackney
+  defp client({Tesla.Adapter.Finch, _}), do: Pleroma.ReverseProxy.Client.Tesla
   defp client(_), do: Pleroma.Config.get!(Pleroma.ReverseProxy.Client)
 end

diff --git a/lib/pleroma/tesla/middleware/connection_pool.ex b/lib/pleroma/tesla/middleware/connection_pool.ex
deleted file mode 100644 (file)
index 906706d..0000000
--- a/lib/pleroma/tesla/middleware/connection_pool.ex
+++ /dev/null
@@ -1,50 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Tesla.Middleware.ConnectionPool do
-  @moduledoc """
-  Middleware to get/release connections from `Pleroma.Gun.ConnectionPool`
-  """
-
-  @behaviour Tesla.Middleware
-
-  alias Pleroma.Gun.ConnectionPool
-
-  @impl Tesla.Middleware
-  def call(%Tesla.Env{url: url, opts: opts} = env, next, _) do
-    uri = URI.parse(url)
-
-    # Avoid leaking connections when the middleware is called twice
-    # with body_as: :chunks. We assume only the middleware can set
-    # opts[:adapter][:conn]
-    if opts[:adapter][:conn] do
-      ConnectionPool.release_conn(opts[:adapter][:conn])
-    end
-
-    case ConnectionPool.get_conn(uri, opts[:adapter]) do
-      {:ok, conn_pid} ->
-        adapter_opts = Keyword.merge(opts[:adapter], conn: conn_pid, close_conn: false)
-        opts = Keyword.put(opts, :adapter, adapter_opts)
-        env = %{env | opts: opts}
-
-        case Tesla.run(env, next) do
-          {:ok, env} ->
-            unless opts[:adapter][:body_as] == :chunks do
-              ConnectionPool.release_conn(conn_pid)
-              {_, res} = pop_in(env.opts[:adapter][:conn])
-              {:ok, res}
-            else
-              {:ok, env}
-            end
-
-          err ->
-            ConnectionPool.release_conn(conn_pid)
-            err
-        end
-
-      err ->
-        err
-    end
-  end
-end

diff --git a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
index 72455afd0a5f518267616a6da965adf42308ee6a..e5449b576bb7be63373f4e78dd2a1771e7e14f5e 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
   require Logger
 
   @adapter_options [
-    recv_timeout: 10_000
+    receive_timeout: 10_000
   ]
 
   @impl true

diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
index da92b57547516903fb4478b51b085ca692918fea..1826031dd4296676fa3fb9aff9900a7eee9c2fc3 100644 (file)
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@ -5,7 +5,7 @@
 defmodule Pleroma.Web.RelMe do
   @options [
     max_body: 2_000_000,
-    recv_timeout: 2_000
+    receive_timeout: 2_000
   ]
 
   if Pleroma.Config.get(:env) == :test do

diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index ba3524307c169c147aa8b5007942d86f1518def1..061c1a79530c94e6233967a5dc85d19a6dca9a13 100644 (file)
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -11,7 +11,7 @@ defmodule Pleroma.Web.RichMedia.Helpers do
 
   @options [
     max_body: 2_000_000,
-    recv_timeout: 2_000
+    receive_timeout: 2_000
   ]
 
   @spec validate_page_url(URI.t() | binary()) :: :ok | :error