Browse Source

Fix supported TLS versions as TLS 1.3 support seems buggy.

tags/v1.1.4
KokaKiwi 5 years ago
parent
commit
b57913b13a
2 changed files with 15 additions and 1 deletions
  1. +8
    -1
      config/config.exs
  2. +7
    -0
      lib/pleroma/http/http.ex

+ 8
- 1
config/config.exs View File

@@ -133,7 +133,14 @@ config :pleroma, :httpoison, Pleroma.HTTP
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",


+ 7
- 0
lib/pleroma/http/http.ex View File

@@ -30,6 +30,7 @@ defmodule Pleroma.HTTP do
options =
process_request_options(options)
|> process_sni_options(url)
|> process_adapter_options()

params = Keyword.get(options, :params, [])

@@ -56,6 +57,12 @@ defmodule Pleroma.HTTP 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)


Loading…
Cancel
Save