From 4943e6a9147d62a326d94cc88edaf513f6f8f342 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Thu, 22 Oct 2026 16:23:40 +0400 Subject: [PATCH 1/8] fix(http): pass IP proxy hosts to Hackney as strings ConfigDB turns a numeric proxy host into an IP tuple. Hackney 1 took it, Hackney 4 ignores such a proxy and connects directly, which skips a SOCKS proxy (Tor) without any error. --- changelog.d/hackney-proxy-ip-host.fix | 1 + lib/pleroma/http/adapter_helper/hackney.ex | 16 ++++++++++++++++ .../pleroma/http/adapter_helper/hackney_test.exs | 13 +++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 changelog.d/hackney-proxy-ip-host.fix diff --git a/changelog.d/hackney-proxy-ip-host.fix b/changelog.d/hackney-proxy-ip-host.fix new file mode 100644 index 000000000..5d11aadd5 --- /dev/null +++ b/changelog.d/hackney-proxy-ip-host.fix @@ -0,0 +1 @@ +Hackney: use the configured proxy when its host is an IP address; Hackney 4 ignored such proxies and connected directly \ No newline at end of file diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex index 314f9e8b1..e9cc04361 100644 --- a/lib/pleroma/http/adapter_helper/hackney.ex +++ b/lib/pleroma/http/adapter_helper/hackney.ex @@ -30,6 +30,22 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy) |> Keyword.put(:follow_redirect, false) |> Keyword.put(:force_redirect, false) + |> normalize_proxy() + end + + # Hackney 4 ignores a proxy whose host is an IP tuple and connects directly. + # ConfigDB turns a numeric proxy host into such a tuple. + defp normalize_proxy(opts) do + case Keyword.fetch(opts, :proxy) do + {:ok, {type, host, port}} when is_tuple(host) -> + Keyword.put(opts, :proxy, {type, :inet.ntoa(host), port}) + + {:ok, {host, port}} when is_tuple(host) -> + Keyword.put(opts, :proxy, {:inet.ntoa(host), port}) + + _ -> + opts + end end defp add_scheme_opts(opts, _), do: opts diff --git a/test/pleroma/http/adapter_helper/hackney_test.exs b/test/pleroma/http/adapter_helper/hackney_test.exs index cf60d994b..22fcc93d1 100644 --- a/test/pleroma/http/adapter_helper/hackney_test.exs +++ b/test/pleroma/http/adapter_helper/hackney_test.exs @@ -39,6 +39,19 @@ defmodule Pleroma.HTTP.AdapterHelper.HackneyTest do assert opts[:proxy] == "localhost:8123" end + test "gives Hackney a string host for a proxy with an IP address", %{uri: uri} do + clear_config([:http, :proxy_url], {:socks5, {127, 0, 0, 1}, 9050}) + assert Hackney.options([], uri)[:proxy] == {:socks5, ~c"127.0.0.1", 9050} + + clear_config([:http, :proxy_url], {{10, 0, 0, 1}, 8123}) + assert Hackney.options([], uri)[:proxy] == {~c"10.0.0.1", 8123} + + clear_config([:http, :proxy_url], nil) + + assert Hackney.options([proxy: {:socks5, {0, 0, 0, 0, 0, 0, 0, 1}, 9050}], uri)[:proxy] == + {:socks5, ~c"::1", 9050} + end + test "respect connection opts and no proxy", %{uri: uri} do opts = Hackney.options([a: 2, b: 1], uri) From e52ba6830358e3901afab4534ef13d1706e60b1f Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Thu, 22 Oct 2026 16:24:47 +0400 Subject: [PATCH 2/8] fix(http): make Hackney use HTTP/1.1 only Hackney 4 negotiates HTTP/2 and shares one connection per host. The media proxy closes a response with :hackney.close/1, which stops the whole connection, so parallel downloads from one host broke each other. --- changelog.d/hackney-http1.fix | 1 + config/config.exs | 4 ++++ test/pleroma/http/adapter_helper/hackney_test.exs | 6 ++++++ 3 files changed, 11 insertions(+) create mode 100644 changelog.d/hackney-http1.fix diff --git a/changelog.d/hackney-http1.fix b/changelog.d/hackney-http1.fix new file mode 100644 index 000000000..a657ed2b0 --- /dev/null +++ b/changelog.d/hackney-http1.fix @@ -0,0 +1 @@ +Hackney: use HTTP/1.1 only, so closing one media proxy response no longer breaks other downloads from the same host \ No newline at end of file diff --git a/config/config.exs b/config/config.exs index e2c110689..ec176df1d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -163,6 +163,10 @@ config :mime, :types, %{ config :tesla, adapter: Tesla.Adapter.Hackney +# Hackney 4 shares one HTTP/2 connection per host, and closing one response +# (as the media proxy does) stops it for every other stream on it. +config :hackney, default_protocols: [:http1] + # Configures http settings, upstream proxy etc. config :pleroma, :http, proxy_url: nil, diff --git a/test/pleroma/http/adapter_helper/hackney_test.exs b/test/pleroma/http/adapter_helper/hackney_test.exs index 22fcc93d1..2bda8165c 100644 --- a/test/pleroma/http/adapter_helper/hackney_test.exs +++ b/test/pleroma/http/adapter_helper/hackney_test.exs @@ -13,6 +13,12 @@ defmodule Pleroma.HTTP.AdapterHelper.HackneyTest do {:ok, uri: uri} end + # Hackney 4 shares one HTTP/2 connection per host, and closing a response + # stops that connection for every stream on it. + test "Hackney only speaks HTTP/1.1" do + assert :hackney_util.default_protocols() == [:http1] + end + describe "options/2" do setup do: clear_config([:http, :adapter], a: 1, b: 2) From 1f2179872a42c78988349d46265cdb296f196c3c Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Thu, 22 Oct 2026 16:24:57 +0400 Subject: [PATCH 3/8] docs: require Elixir 1.17 and OTP 27 in the install guides --- changelog.d/docs-elixir-1.17.skip | 0 docs/installation/debian_based_jp.md | 2 +- docs/installation/erlang_elixir_requirements.include | 4 ++-- docs/installation/migrating_from_rebased.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 changelog.d/docs-elixir-1.17.skip diff --git a/changelog.d/docs-elixir-1.17.skip b/changelog.d/docs-elixir-1.17.skip new file mode 100644 index 000000000..e69de29bb diff --git a/docs/installation/debian_based_jp.md b/docs/installation/debian_based_jp.md index 5b261296d..c853840c2 100644 --- a/docs/installation/debian_based_jp.md +++ b/docs/installation/debian_based_jp.md @@ -14,7 +14,7 @@ Note: This article is potentially outdated because at this time we may not have - PostgreSQL 11.0以上 (Ubuntu16.04では9.5しか提供されていないので，[](https://www.postgresql.org/download/linux/ubuntu/)こちらから新しいバージョンを入手してください) - `postgresql-contrib` 11.0以上 (同上) -- Elixir 1.15 以上 ([Debianのリポジトリからインストールしないこと！！！ ここからインストールすること！](https://elixir-lang.org/install.html#unix-and-unix-like)。または [asdf](https://github.com/asdf-vm/asdf) をpleromaユーザーでインストールしてください) +- Elixir 1.17 以上 (Erlang/OTP 27 以上) ([Debianのリポジトリからインストールしないこと！！！ ここからインストールすること！](https://elixir-lang.org/install.html#unix-and-unix-like)。または [asdf](https://github.com/asdf-vm/asdf) をpleromaユーザーでインストールしてください) - `erlang-dev` - `erlang-nox` - `git` diff --git a/docs/installation/erlang_elixir_requirements.include b/docs/installation/erlang_elixir_requirements.include index aa336dfe9..395d0f9de 100644 --- a/docs/installation/erlang_elixir_requirements.include +++ b/docs/installation/erlang_elixir_requirements.include @@ -1,2 +1,2 @@ -* Elixir >=1.15.0, <1.20 -* Erlang OTP >=24.0.0 (supported: <29) +* Elixir >=1.17.0, <1.20 +* Erlang OTP >=27.0.0 (supported: <29) diff --git a/docs/installation/migrating_from_rebased.md b/docs/installation/migrating_from_rebased.md index ce7f43b0d..254f2884a 100644 --- a/docs/installation/migrating_from_rebased.md +++ b/docs/installation/migrating_from_rebased.md @@ -46,7 +46,7 @@ present, `uploads`, and `instance`. Diff and restore any other non-stock configuration files, preserve their ownership, and review them before starting Pleroma. -Pleroma requires Elixir 1.15 or newer. Install supported Erlang and Elixir +Pleroma requires Elixir 1.17 or newer and Erlang/OTP 27 or newer. Install supported Erlang and Elixir versions as described in the installation guide for your distribution before running any Mix command. Do not reuse Rebased's `.tool-versions`. If you keep using [`asdf`](https://asdf-vm.com/), select supported versions in the From de6ac2392cfcee2a2c283cf823333d25fe6983d4 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Thu, 22 Oct 2026 16:25:54 +0400 Subject: [PATCH 4/8] fix(formatter): keep links with formatted text in MFM posts The email autolink clause also matched a link whose only child is an element, raised on "mailto:" <> element, and the rescue turned the whole post into escaped source text. --- lib/pleroma/formatter.ex | 3 ++- test/pleroma/formatter_test.exs | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 1cb9884a5..32ee6a296 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -169,7 +169,8 @@ defmodule Pleroma.Formatter do Enum.map(nodes, &strip_email_autolinks(&1, emails)) end - defp strip_email_autolinks({"a", attrs, [email], _meta} = node, emails) do + defp strip_email_autolinks({"a", attrs, [email], _meta} = node, emails) + when is_binary(email) do if List.keyfind(attrs, "href", 0) == {"href", "mailto:" <> email} and MapSet.member?(emails, email) do email diff --git a/test/pleroma/formatter_test.exs b/test/pleroma/formatter_test.exs index 724b3075f..906d39e4f 100644 --- a/test/pleroma/formatter_test.exs +++ b/test/pleroma/formatter_test.exs @@ -375,6 +375,16 @@ defmodule Pleroma.FormatterTest do end describe "markdown_to_html/2" do + test "keeps formatted link text when stripping email autolinks" do + opts = %{breaks: true, strip_email_autolinks: true} + + assert Formatter.markdown_to_html("[**hello**](https://example.org/)", opts) == + ~s(

hello

) + + assert Formatter.markdown_to_html("[`code`](https://example.org/)", opts) == + ~s(

code

) + end + test "escapes link attribute values" do markdown = ~s|[click](http://example.com/?a=x" onerror="alert(1))| From 58d4f6aa2cb4aef758fcb9dff093e4cf8b6b0af7 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Thu, 22 Oct 2026 16:28:06 +0400 Subject: [PATCH 5/8] fix(formatter): percent-encode quotes in Markdown URLs instead of cutting Cutting the URL at the first quote dropped the rest of valid links such as ?q="cat"&page=2. Percent-encoding ", < and > keeps the URL complete and still keeps it inside the attribute. --- lib/pleroma/formatter.ex | 10 +++++++--- test/pleroma/formatter_test.exs | 18 +++++++++++------- test/pleroma/web/common_api/utils_test.exs | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 32ee6a296..59df4d20a 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -252,9 +252,13 @@ defmodule Pleroma.Formatter do defp sanitize_markdown_url(value, name) do if String.downcase(to_string(name)) in ["href", "src"] do - value - |> String.split(~r/["<>]/, parts: 2) - |> hd() + # Percent-encode instead of cutting, so the URL stays complete but can + # never close the attribute or open a tag. + String.replace(value, ~r/["<>]/, fn + "\"" -> "%22" + "<" -> "%3C" + ">" -> "%3E" + end) else value end diff --git a/test/pleroma/formatter_test.exs b/test/pleroma/formatter_test.exs index 906d39e4f..2954e526f 100644 --- a/test/pleroma/formatter_test.exs +++ b/test/pleroma/formatter_test.exs @@ -388,10 +388,9 @@ defmodule Pleroma.FormatterTest do test "escapes link attribute values" do markdown = ~s|[click](http://example.com/?a=x" onerror="alert(1))| - html = Formatter.markdown_to_html(markdown) - - assert html =~ ~s|href="http://example.com/?a=x"| - refute html =~ "onerror" + # The quotes are percent-encoded, so everything stays inside href. + assert Formatter.markdown_to_html(markdown) == + ~s|

click

| end test "preserves entities without rendering dangerous raw HTML" do @@ -416,10 +415,15 @@ defmodule Pleroma.FormatterTest do test "rejects entity-encoded URL delimiters" do markdown = "[click](http://example.com/?a=x"onerror=alert(1))" - html = Formatter.markdown_to_html(markdown) + assert Formatter.markdown_to_html(markdown) == + ~s|

click

| + end - assert html =~ ~s|href="http://example.com/?a=x"| - refute html =~ "onerror" + test "keeps URLs with encoded quotes complete" do + markdown = "[search](https://example.org/?q="cat"&page=2)" + + assert Formatter.markdown_to_html(markdown) == + ~s(

search

) end test "strips email autolinks without changing explicit mailto links" do diff --git a/test/pleroma/web/common_api/utils_test.exs b/test/pleroma/web/common_api/utils_test.exs index ff5150c40..44a7486de 100644 --- a/test/pleroma/web/common_api/utils_test.exs +++ b/test/pleroma/web/common_api/utils_test.exs @@ -232,7 +232,7 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do code = ~s|[click](http://example.com/?a=x" onerror="alert(1))| {result, [], []} = Utils.format_input(code, "text/markdown") - assert result =~ ~s() + assert result =~ ~s|| refute result =~ ~s|onerror="alert(1)| refute result =~ ~s( Date: Thu, 22 Oct 2026 16:30:38 +0400 Subject: [PATCH 6/8] fix(html): check link schemes the way browsers read them FastSanitize checks the scheme with URI.parse/1, which finds none in javascript:alert(1). Browsers remove tabs and newlines and leading control characters first and run it as a javascript: link. The scrubbers now use Pleroma.HTML.URIAttributes, which normalizes the URL the same way before the scheme check. --- changelog.d/scrubber-hidden-schemes.security | 1 + lib/pleroma/html/uri_attributes.ex | 40 ++++++++++++++++++++ priv/scrubbers/default.ex | 9 ++++- priv/scrubbers/links_only.ex | 3 +- priv/scrubbers/twitter_text.ex | 9 ++++- test/pleroma/html_test.exs | 38 +++++++++++++++++++ 6 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 changelog.d/scrubber-hidden-schemes.security create mode 100644 lib/pleroma/html/uri_attributes.ex diff --git a/changelog.d/scrubber-hidden-schemes.security b/changelog.d/scrubber-hidden-schemes.security new file mode 100644 index 000000000..fc1807e72 --- /dev/null +++ b/changelog.d/scrubber-hidden-schemes.security @@ -0,0 +1 @@ +Scrubbers: remove links and images whose scheme is hidden with tabs, newlines or leading control characters (for example javascript:), which browsers still run as javascript:. Custom scrubbers should use Pleroma.HTML.URIAttributes.allow_tag_with_uri_attributes instead of the FastSanitize macro \ No newline at end of file diff --git a/lib/pleroma/html/uri_attributes.ex b/lib/pleroma/html/uri_attributes.ex new file mode 100644 index 000000000..491f43e3d --- /dev/null +++ b/lib/pleroma/html/uri_attributes.ex @@ -0,0 +1,40 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2022 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.HTML.URIAttributes do + @moduledoc """ + URI attribute rules for the scrubbers. + + Works like `FastSanitize.Sanitizer.Meta.allow_tag_with_uri_attributes/3`, but + checks the scheme the way a browser reads the URL. Browsers remove tabs and + newlines anywhere and control characters and spaces at the start, so + `java\\tscript:` is a `javascript:` link to them, while `URI.parse/1` finds no + scheme and FastSanitize lets it through. + """ + + defmacro allow_tag_with_uri_attributes(tag, attrs, valid_schemes) do + for attr <- attrs do + quote do + def scrub_attribute(unquote(tag), {unquote(attr), "&" <> _}), do: nil + + def scrub_attribute(unquote(tag), {unquote(attr), uri} = attribute) do + if Pleroma.HTML.URIAttributes.valid_scheme?(uri, unquote(valid_schemes)), + do: attribute + end + end + end + end + + @spec valid_scheme?(String.t(), [String.t()]) :: boolean() + def valid_scheme?(uri, valid_schemes) do + scheme = + uri + |> String.replace(~r/[\t\n\r]/, "") + |> String.replace(~r/\A[\x00-\x20]+/, "") + |> URI.parse() + |> Map.get(:scheme) + + is_nil(scheme) or scheme in valid_schemes + end +end diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex index 8e2d16650..b294ce4ee 100644 --- a/priv/scrubbers/default.ex +++ b/priv/scrubbers/default.ex @@ -6,6 +6,7 @@ defmodule Pleroma.HTML.Scrubber.Default do @doc "The default HTML scrubbing policy: no " require FastSanitize.Sanitizer.Meta + require Pleroma.HTML.URIAttributes alias FastSanitize.Sanitizer.Meta # credo:disable-for-previous-line @@ -15,7 +16,11 @@ defmodule Pleroma.HTML.Scrubber.Default do Meta.strip_comments() - Meta.allow_tag_with_uri_attributes(:a, ["href", "data-user", "data-tag"], @valid_schemes) + Pleroma.HTML.URIAttributes.allow_tag_with_uri_attributes( + :a, + ["href", "data-user", "data-tag"], + @valid_schemes + ) Meta.allow_tag_with_this_attribute_values(:a, "class", [ "hashtag", @@ -145,7 +150,7 @@ defmodule Pleroma.HTML.Scrubber.Default do Meta.allow_tag_with_this_attribute_values(:img, "class", ["emoji"]) # restrict img tags to http/https only, because of MediaProxy. - Meta.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"]) + Pleroma.HTML.URIAttributes.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"]) Meta.allow_tag_with_these_attributes(:img, [ "width", diff --git a/priv/scrubbers/links_only.ex b/priv/scrubbers/links_only.ex index 7f434fb25..42050d05a 100644 --- a/priv/scrubbers/links_only.ex +++ b/priv/scrubbers/links_only.ex @@ -10,12 +10,13 @@ defmodule Pleroma.HTML.Scrubber.LinksOnly do @valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], []) require FastSanitize.Sanitizer.Meta + require Pleroma.HTML.URIAttributes alias FastSanitize.Sanitizer.Meta Meta.strip_comments() # links - Meta.allow_tag_with_uri_attributes(:a, ["href"], @valid_schemes) + Pleroma.HTML.URIAttributes.allow_tag_with_uri_attributes(:a, ["href"], @valid_schemes) Meta.allow_tag_with_this_attribute_values(:a, "rel", [ "tag", diff --git a/priv/scrubbers/twitter_text.ex b/priv/scrubbers/twitter_text.ex index 4df840735..266411e72 100644 --- a/priv/scrubbers/twitter_text.ex +++ b/priv/scrubbers/twitter_text.ex @@ -11,12 +11,17 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do @valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], []) require FastSanitize.Sanitizer.Meta + require Pleroma.HTML.URIAttributes alias FastSanitize.Sanitizer.Meta Meta.strip_comments() # links - Meta.allow_tag_with_uri_attributes(:a, ["href", "data-user", "data-tag"], @valid_schemes) + Pleroma.HTML.URIAttributes.allow_tag_with_uri_attributes( + :a, + ["href", "data-user", "data-tag"], + @valid_schemes + ) Meta.allow_tag_with_this_attribute_values(:a, "class", [ "hashtag", @@ -49,7 +54,7 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do Meta.allow_tag_with_this_attribute_values(:img, "class", ["emoji"]) # restrict img tags to http/https only, because of MediaProxy. - Meta.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"]) + Pleroma.HTML.URIAttributes.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"]) Meta.allow_tag_with_these_attributes(:img, [ "width", diff --git a/test/pleroma/html_test.exs b/test/pleroma/html_test.exs index d17b07540..9266f62ed 100644 --- a/test/pleroma/html_test.exs +++ b/test/pleroma/html_test.exs @@ -141,6 +141,44 @@ defmodule Pleroma.HTMLTest do end end + describe "link schemes as a browser sees them" do + # Browsers remove tabs and newlines in URLs and control characters and + # spaces at the start, so these are javascript: links to them. + test "removes javascript: links hidden with control characters" do + for href <- [ + "java\tscript:alert(1)", + "java script:alert(1)", + "java\nscript:alert(1)", + " javascript:alert(1)", + " javascript:alert(1)", + "\u0001javascript:alert(1)" + ], + scrubber <- [ + Pleroma.HTML.Scrubber.Default, + Pleroma.HTML.Scrubber.TwitterText, + Pleroma.HTML.Scrubber.LinksOnly + ] do + html = HTML.filter_tags(~s(x), scrubber) + + refute html =~ "href", "#{inspect(href)} survived #{inspect(scrubber)}: #{html}" + end + end + + test "keeps normal links" do + for href <- ["https://example.org/a?b=c", "/relative/path", "#fragment"] do + assert HTML.filter_tags(~s(x), Pleroma.HTML.Scrubber.Default) == + ~s(x) + end + end + + test "removes images with hidden schemes" do + html = + HTML.filter_tags(~s||, Pleroma.HTML.Scrubber.Default) + + refute html =~ "src" + end + end + describe "default scrubber" do test "normalizes HTML as expected" do expected = """ From b2e4580a81c2b7ecb703d89959ff007aa35be08c Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Thu, 22 Oct 2026 16:31:44 +0400 Subject: [PATCH 7/8] feat(http): make Gun the default HTTP client Hackney 4 reads every response completely before Pleroma can check its size, so max_body no longer limits downloads or memory there; Gun stops at the limit. Document the Hackney limitation for those who switch back. --- changelog.d/gun-default.change | 1 + config/config.exs | 2 +- docs/configuration/cheatsheet.md | 11 +++++++++++ test/pleroma/http/default_adapter_test.exs | 13 +++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 changelog.d/gun-default.change create mode 100644 test/pleroma/http/default_adapter_test.exs diff --git a/changelog.d/gun-default.change b/changelog.d/gun-default.change new file mode 100644 index 000000000..97ca20903 --- /dev/null +++ b/changelog.d/gun-default.change @@ -0,0 +1 @@ +Gun is now the default HTTP client instead of Hackney \ No newline at end of file diff --git a/config/config.exs b/config/config.exs index ec176df1d..656e70ff8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -161,7 +161,7 @@ config :mime, :types, %{ "image/apng" => ["apng"] } -config :tesla, adapter: Tesla.Adapter.Hackney +config :tesla, adapter: Tesla.Adapter.Gun # Hackney 4 shares one HTTP/2 connection per host, and closing one response # (as the media proxy does) stops it for every other stream on it. diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 0275d2be0..0460caf26 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -541,6 +541,15 @@ Available caches: ## HTTP client +Pleroma uses [Gun](https://github.com/ninenines/gun) for outgoing HTTP requests. To use Hackney instead: + +```elixir +config :tesla, adapter: Tesla.Adapter.Hackney +``` + +!!! note + With Hackney, size limits for fetched responses (for example for link previews) are checked only after Hackney has read the whole response. They limit what Pleroma keeps, not how much it downloads or holds in memory. Gun stops reading at the limit. + ### :http * `proxy_url`: an upstream proxy to fetch posts and/or media with, (default: `nil`) @@ -550,6 +559,8 @@ Available caches: ### :hackney_pools +*For `hackney` adapter* + Advanced. Tweaks Hackney (http client) connections pools. There's three pools used: diff --git a/test/pleroma/http/default_adapter_test.exs b/test/pleroma/http/default_adapter_test.exs new file mode 100644 index 000000000..e4f57dfa2 --- /dev/null +++ b/test/pleroma/http/default_adapter_test.exs @@ -0,0 +1,13 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2022 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.HTTP.DefaultAdapterTest do + use ExUnit.Case, async: true + + # The test environment uses Tesla.Mock, and config.exs imports the config + # of the current Mix env, so check the shipped default in the file itself. + test "Gun is the default HTTP client" do + assert File.read!("config/config.exs") =~ ~r/^config :tesla, adapter: Tesla.Adapter.Gun$/m + end +end From 532762bd9b66e76a1cba4a22983446e1c30d26f4 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Thu, 22 Oct 2026 16:36:16 +0400 Subject: [PATCH 8/8] fix(http): keep the configured TLS options with Gun [:http, :adapter, :ssl_options] is Hackney's key, and AdminFE sets it. Gun reads tls_opts, so with Gun as the default these settings were lost without a warning. Use them as tls_opts unless tls_opts is set. --- lib/pleroma/http/adapter_helper/gun.ex | 10 ++++++++++ test/pleroma/http/adapter_helper/gun_test.exs | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex index 9ac87adb5..11efaca88 100644 --- a/lib/pleroma/http/adapter_helper/gun.ex +++ b/lib/pleroma/http/adapter_helper/gun.ex @@ -28,6 +28,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do @defaults |> Keyword.merge(config_opts) + |> ssl_options_to_tls_opts() |> add_scheme_opts(uri) |> AdapterHelper.maybe_add_proxy(proxy) |> Keyword.merge(incoming_opts) @@ -35,6 +36,15 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do |> maybe_stream() end + # [:http, :adapter, :ssl_options] is Hackney's name for the TLS options, + # and AdminFE sets it. Keep those settings when Gun is the adapter. + defp ssl_options_to_tls_opts(opts) do + case Keyword.pop(opts, :ssl_options) do + {nil, opts} -> opts + {ssl_options, opts} -> Keyword.put_new(opts, :tls_opts, ssl_options) + end + end + defp add_scheme_opts(opts, %{scheme: "http"}), do: opts defp add_scheme_opts(opts, %{scheme: "https"}) do diff --git a/test/pleroma/http/adapter_helper/gun_test.exs b/test/pleroma/http/adapter_helper/gun_test.exs index 1c97daf99..f4f96faeb 100644 --- a/test/pleroma/http/adapter_helper/gun_test.exs +++ b/test/pleroma/http/adapter_helper/gun_test.exs @@ -50,6 +50,15 @@ defmodule Pleroma.HTTP.AdapterHelper.GunTest do assert Keyword.has_key?(defaults, :b) end + test "uses Hackney's ssl_options from the config as Gun's tls_opts" do + clear_config([:http, :adapter], ssl_options: [versions: [:"tlsv1.3"]]) + + opts = Gun.options([], URI.parse("https://example.com")) + + assert opts[:tls_opts] == [versions: [:"tlsv1.3"]] + refute Keyword.has_key?(opts, :ssl_options) + end + test "parses string proxy host & port" do clear_config([:http, :proxy_url], "localhost:8123")