Commit 46200d8f authored by kaniini's avatar kaniini
Browse files

Merge branch 'fix-tlsv1.3' into 'develop'

Fix supported TLS versions as TLS 1.3 support seems buggy.

Closes #708

See merge request !892
parents 735f4004 b57913b1
Pipeline #8776 passed with stages
in 3 minutes and 30 seconds
......@@ -133,7 +133,14 @@
config :tesla, adapter: Tesla.Adapter.Hackney
# Configures http settings, upstream proxy etc.
config :pleroma, :http, proxy_url: nil
config :pleroma, :http,
proxy_url: nil,
adapter: [
ssl_options: [
# We don't support TLS v1.3 yet
versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"]
]
]
config :pleroma, :instance,
name: "Pleroma",
......
......@@ -30,6 +30,7 @@ def request(method, url, body \\ "", headers \\ [], options \\ []) do
options =
process_request_options(options)
|> process_sni_options(url)
|> process_adapter_options()
params = Keyword.get(options, :params, [])
......@@ -56,6 +57,12 @@ defp process_sni_options(options, url) do
end
end
def process_adapter_options(options) do
adapter_options = Pleroma.Config.get([:http, :adapter], [])
options ++ [adapter: adapter_options]
end
def process_request_options(options) do
config = Application.get_env(:pleroma, :http, [])
proxy = Keyword.get(config, :proxy_url, nil)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment