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.
This commit is contained in:
parent
bbc53f0fef
commit
4943e6a914
3 changed files with 30 additions and 0 deletions
1
changelog.d/hackney-proxy-ip-host.fix
Normal file
1
changelog.d/hackney-proxy-ip-host.fix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Hackney: use the configured proxy when its host is an IP address; Hackney 4 ignored such proxies and connected directly
|
||||||
|
|
@ -30,6 +30,22 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do
|
||||||
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)
|
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)
|
||||||
|> Keyword.put(:follow_redirect, false)
|
|> Keyword.put(:follow_redirect, false)
|
||||||
|> Keyword.put(:force_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
|
end
|
||||||
|
|
||||||
defp add_scheme_opts(opts, _), do: opts
|
defp add_scheme_opts(opts, _), do: opts
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,19 @@ defmodule Pleroma.HTTP.AdapterHelper.HackneyTest do
|
||||||
assert opts[:proxy] == "localhost:8123"
|
assert opts[:proxy] == "localhost:8123"
|
||||||
end
|
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
|
test "respect connection opts and no proxy", %{uri: uri} do
|
||||||
opts = Hackney.options([a: 2, b: 1], uri)
|
opts = Hackney.options([a: 2, b: 1], uri)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue