commit: ae0e41fd8b583be818f3576cd260e66a689923cb
parent be7a6db1f54a033afb7cb564f9cf0c9bdafe5055
Author: kaniini <nenolod@gmail.com>
Date: Fri, 24 Aug 2018 20:15:59 +0000
Merge branch 'feature/tls-sni-support' into 'develop'
http: fix TLS server name indication
Closes #261
See merge request pleroma/pleroma!291
Diffstat:
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
@@ -1,5 +1,23 @@
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
config = Application.get_env(:pleroma, :http, [])
@@ -10,4 +28,9 @@ defmodule Pleroma.HTTP do
_ -> options ++ [proxy: proxy]
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