projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
[akkoma]
/
lib
/
pleroma
/
gun
/
conn.ex
diff --git
a/lib/pleroma/gun/conn.ex
b/lib/pleroma/gun/conn.ex
index 9dc8880db9a8a5c2f3571503be7c74be3ba6b55a..477e19c6e1d7589eccb1a9d1394451502d1571c5 100644
(file)
--- a/
lib/pleroma/gun/conn.ex
+++ b/
lib/pleroma/gun/conn.ex
@@
-13,7
+13,7
@@
defmodule Pleroma.Gun.Conn do
opts =
opts
|> Enum.into(%{})
opts =
opts
|> Enum.into(%{})
- |> Map.put_new(:
await_up_timeout, pool_opts[:await_up
_timeout] || 5_000)
+ |> Map.put_new(:
connect_timeout, pool_opts[:connect
_timeout] || 5_000)
|> Map.put_new(:supervise, false)
|> maybe_add_tls_opts(uri)
|> Map.put_new(:supervise, false)
|> maybe_add_tls_opts(uri)
@@
-22,15
+22,14
@@
defmodule Pleroma.Gun.Conn do
defp maybe_add_tls_opts(opts, %URI{scheme: "http"}), do: opts
defp maybe_add_tls_opts(opts, %URI{scheme: "http"}), do: opts
- defp maybe_add_tls_opts(opts, %URI{scheme: "https"
, host: host
}) do
+ defp maybe_add_tls_opts(opts, %URI{scheme: "https"}) do
tls_opts = [
verify: :verify_peer,
cacertfile: CAStore.file_path(),
depth: 20,
reuse_sessions: false,
tls_opts = [
verify: :verify_peer,
cacertfile: CAStore.file_path(),
depth: 20,
reuse_sessions: false,
- verify_fun:
- {&:ssl_verify_hostname.verify_fun/3,
- [check_hostname: Pleroma.HTTP.AdapterHelper.format_host(host)]}
+ log_level: :warning,
+ customize_hostname_check: [match_fun: :public_key.pkix_verify_hostname_match_fun(:https)]
]
tls_opts =
]
tls_opts =
@@
-51,10
+50,10
@@
defmodule Pleroma.Gun.Conn do
with open_opts <- Map.delete(opts, :tls_opts),
{:ok, conn} <- Gun.open(proxy_host, proxy_port, open_opts),
with open_opts <- Map.delete(opts, :tls_opts),
{:ok, conn} <- Gun.open(proxy_host, proxy_port, open_opts),
- {:ok,
_} <- Gun.await_up(conn, opts[:await_up
_timeout]),
+ {:ok,
protocol} <- Gun.await_up(conn, opts[:connect
_timeout]),
stream <- Gun.connect(conn, connect_opts),
{:response, :fin, 200, _} <- Gun.await(conn, stream) do
stream <- Gun.connect(conn, connect_opts),
{:response, :fin, 200, _} <- Gun.await(conn, stream) do
- {:ok, conn}
+ {:ok, conn
, protocol
}
else
error ->
Logger.warn(
else
error ->
Logger.warn(
@@
-89,8
+88,8
@@
defmodule Pleroma.Gun.Conn do
|> Map.put(:socks_opts, socks_opts)
with {:ok, conn} <- Gun.open(proxy_host, proxy_port, opts),
|> Map.put(:socks_opts, socks_opts)
with {:ok, conn} <- Gun.open(proxy_host, proxy_port, opts),
- {:ok,
_} <- Gun.await_up(conn, opts[:await_up
_timeout]) do
- {:ok, conn}
+ {:ok,
protocol} <- Gun.await_up(conn, opts[:connect
_timeout]) do
+ {:ok, conn
, protocol
}
else
error ->
Logger.warn(
else
error ->
Logger.warn(
@@
-107,8
+106,8
@@
defmodule Pleroma.Gun.Conn do
host = Pleroma.HTTP.AdapterHelper.parse_host(host)
with {:ok, conn} <- Gun.open(host, port, opts),
host = Pleroma.HTTP.AdapterHelper.parse_host(host)
with {:ok, conn} <- Gun.open(host, port, opts),
- {:ok,
_} <- Gun.await_up(conn, opts[:await_up
_timeout]) do
- {:ok, conn}
+ {:ok,
protocol} <- Gun.await_up(conn, opts[:connect
_timeout]) do
+ {:ok, conn
, protocol
}
else
error ->
Logger.warn(
else
error ->
Logger.warn(