From 29475eb610555093c6423b8b4eac0ff45065cd12 Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Tue, 27 Apr 2021 19:19:17 +0200
Subject: [PATCH] feat(emqx_http_lib): try to parse host ip

---
 src/emqx_http_lib.erl        |  7 ++++---
 src/emqx_misc.erl            | 13 +++++++++++--
 test/emqx_http_lib_tests.erl |  7 ++++++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/emqx_http_lib.erl b/src/emqx_http_lib.erl
index 4dc263f78..9e86fe394 100644
--- a/src/emqx_http_lib.erl
+++ b/src/emqx_http_lib.erl
@@ -91,7 +91,7 @@ do_parse(URI) ->
             normalise_parse_result(Map2)
     end.
 
-normalise_parse_result(#{host := _, scheme := Scheme0} = Map) ->
+normalise_parse_result(#{host := Host, scheme := Scheme0} = Map) ->
     Scheme = atom_scheme(Scheme0),
     DefaultPort = case https =:= Scheme of
                       true  -> 443;
@@ -101,7 +101,8 @@ normalise_parse_result(#{host := _, scheme := Scheme0} = Map) ->
                N when is_number(N) -> N;
                _ -> DefaultPort
            end,
-    Map#{ scheme => Scheme
+    Map#{ scheme := Scheme
+        , host := emqx_misc:maybe_parse_ip(Host)
         , port => Port
         }.
 
@@ -157,4 +158,4 @@ integer_to_hexlist(Int) ->
 
 hex2dec(X) when (X>=$0) andalso (X=<$9) -> X-$0;
 hex2dec(X) when (X>=$A) andalso (X=<$F) -> X-$A+10;
-hex2dec(X) when (X>=$a) andalso (X=<$f) -> X-$a+10.
\ No newline at end of file
+hex2dec(X) when (X>=$a) andalso (X=<$f) -> X-$a+10.
diff --git a/src/emqx_misc.erl b/src/emqx_misc.erl
index 4ba23d56e..04af5f72c 100644
--- a/src/emqx_misc.erl
+++ b/src/emqx_misc.erl
@@ -43,6 +43,7 @@
         , now_to_secs/1
         , now_to_ms/1
         , index_of/2
+        , maybe_parse_ip/1
         , ipv6_probe/1
         ]).
 
@@ -51,6 +52,14 @@
         , hexstr2bin/1
         ]).
 
+%% @doc Parse v4 or v6 string format address to tuple.
+%% `Host' itself is returned if it's not an ip string.
+maybe_parse_ip(Host) ->
+    case inet:parse_address(Host) of
+        {ok, Addr} when is_tuple(Addr) -> Addr;
+        {error, einval} -> Host
+    end.
+
 %% @doc Add `ipv6_probe' socket option if it's supported.
 ipv6_probe(Opts) ->
     case persistent_term:get({?MODULE, ipv6_probe_supported}, unknown) of
@@ -65,7 +74,7 @@ ipv6_probe(Opts) ->
     end.
 
 ipv6_probe(false, Opts) -> Opts;
-ipv6_probe(true, Opts) -> [ipv6_probe | Opts].
+ipv6_probe(true, Opts) -> [{ipv6_probe, true} | Opts].
 
 %% @doc Merge options
 -spec(merge_opts(Opts, Opts) -> Opts when Opts :: proplists:proplist()).
@@ -279,6 +288,6 @@ hexchar2int(I) when I >= $a andalso I =< $f -> I - $a + 10.
 -include_lib("eunit/include/eunit.hrl").
 
 ipv6_probe_test() ->
-    ?assertEqual([ipv6_probe], ipv6_probe([])).
+    ?assertEqual([{ipv6_probe, true}], ipv6_probe([])).
 
 -endif.
diff --git a/test/emqx_http_lib_tests.erl b/test/emqx_http_lib_tests.erl
index b5c50e7c9..393d1ff86 100644
--- a/test/emqx_http_lib_tests.erl
+++ b/test/emqx_http_lib_tests.erl
@@ -62,7 +62,7 @@ uri_parse_test_() ->
        end
       }
     , {"normalise",
-       fun() -> ?assertMatch({ok, #{scheme := https}},
+       fun() -> ?assertMatch({ok, #{scheme := https, host := {127, 0, 0, 1}}},
                              emqx_http_lib:uri_parse("HTTPS://127.0.0.1"))
        end
       }
@@ -71,4 +71,9 @@ uri_parse_test_() ->
                              emqx_http_lib:uri_parse("wss://127.0.0.1"))
        end
       }
+    , {"ipv6 host",
+       fun() -> ?assertMatch({ok, #{scheme := http, host := T}} when size(T) =:= 8,
+                             emqx_http_lib:uri_parse("http://[::1]:80"))
+       end
+      }
     ].