Merge branch 'feature/tls-sni-support' into 'develop'
http: fix TLS server name indication Closes #261 See merge request pleroma/pleroma!291
This commit is contained in:
commit
ae0e41fd8b
|
@ -1,5 +1,23 @@
|
||||||
defmodule Pleroma.HTTP do
|
defmodule Pleroma.HTTP do
|
||||||
use HTTPoison.Base
|
require HTTPoison
|
||||||
|
|
||||||
|
def request(method, url, body \\ "", headers \\ [], options \\ []) do
|
||||||
|
options =
|
||||||
|
process_request_options(options)
|
||||||
|
|> process_sni_options(url)
|
||||||
|
|
||||||
|
HTTPoison.request(method, url, body, headers, options)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp process_sni_options(options, url) do
|
||||||
|
uri = URI.parse(url)
|
||||||
|
host = uri.host |> to_charlist()
|
||||||
|
|
||||||
|
case uri.scheme do
|
||||||
|
"https" -> options ++ [ssl: [server_name_indication: host]]
|
||||||
|
_ -> options
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def process_request_options(options) do
|
def process_request_options(options) do
|
||||||
config = Application.get_env(:pleroma, :http, [])
|
config = Application.get_env(:pleroma, :http, [])
|
||||||
|
@ -10,4 +28,9 @@ def process_request_options(options) do
|
||||||
_ -> options ++ [proxy: proxy]
|
_ -> options ++ [proxy: proxy]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get(url, headers \\ [], options \\ []), do: request(:get, url, "", headers, options)
|
||||||
|
|
||||||
|
def post(url, body, headers \\ [], options \\ []),
|
||||||
|
do: request(:post, url, body, headers, options)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue