Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix accessing HTTPS sites with an IPv4 address #494

Merged
merged 5 commits into from Jun 9, 2018
Merged

Fix accessing HTTPS sites with an IPv4 address #494

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5af76eb
Fix accessing HTTPS sites with an IP address
piotrklibert Mar 17, 2018
a498524
Move the code to its own function, use inet:parse_address, add docstring
Apr 3, 2018
10f6ba3
Without a tag, actually (fixed docstring)
Apr 3, 2018
869cbfb
Fix wording in a comment
Apr 3, 2018
88c4bc1
Right, I'm blind
Apr 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/hackney_ssl.erl
View file
Open in desktop
Expand Up @@ -44,21 +44,34 @@
%% @doc Atoms used to identify messages in {active, once | true} mode.
messages(_) -> {ssl, ssl_closed, ssl_error}.

%% @doc The ssl:connect/4 (and related) doesn't work with textual representation
%% of IP addresses. It accepts either a string with a DNS-resolvable name or a
%% tuple with parts of an IP as numbers. This function attempts to parse given
%% string and either returns such tuple, or the string if it's impossible to
%% parse.
parse_address(Host) when is_list(Host) ->
case inet:parse_address(Host) of
{ok, Address} -> Address;
{error, _} -> Host
end.


connect(Host, Port, Opts) ->
connect(Host, Port, Opts, infinity).

connect(Host, Port, Opts, Timeout) when is_list(Host), is_integer(Port),
(Timeout =:= infinity orelse is_integer(Timeout)) ->

BaseOpts = [binary, {active, false}, {packet, raw},
{secure_renegotiate, true},
{reuse_sessions, true},
{honor_cipher_order, true},
{versions,['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]},
{ciphers, ciphers()}],
Opts1 = hackney_util:merge_opts(BaseOpts, Opts),

Host1 = parse_address(Host),
%% connect
ssl:connect(Host, Port, Opts1, Timeout).
ssl:connect(Host1, Port, Opts1, Timeout).


ciphers() ->
Expand Down