Merge pull request #1322 from tsloughter/binary_uri_encode

Add unicode binary  support to http_uri functions 
OTP-14404

1 files changed, 96 insertions, 8 deletions

diff --git a/lib/inets/test/uri_SUITE.erl b/lib/inets/test/uri_SUITE.erl
index b26c645821..d055af59e3 100644
--- a/lib/inets/test/uri_SUITE.erl
+++ b/lib/inets/test/uri_SUITE.erl
@@ -25,6 +25,7 @@
 
 -module(uri_SUITE).
 
+-include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include("inets_test_lib.hrl").
 
@@ -50,7 +51,8 @@ all() ->
      fragments,
      escaped,
      hexed_query,
-     scheme_validation
+     scheme_validation,
+     encode_decode
     ].
 
 %%--------------------------------------------------------------------
@@ -73,7 +75,10 @@ end_per_testcase(_Case, _Config) ->
 
 ipv4(Config) when is_list(Config) ->
     {ok, {http,[],"127.0.0.1",80,"/foobar.html",[]}} =
-	http_uri:parse("http://127.0.0.1/foobar.html").
+    http_uri:parse("http://127.0.0.1/foobar.html"),
+
+    {ok, {http,<<>>,<<"127.0.0.1">>,80,<<"/foobar.html">>,<<>>}} =
+    http_uri:parse(<<"http://127.0.0.1/foobar.html">>).
 
 ipv6(Config) when is_list(Config) ->
     {ok, {http,[],"2010:836B:4179::836B:4179",80,"/foobar.html",[]}} =
@@ -89,24 +94,52 @@ ipv6(Config) when is_list(Config) ->
 		       [{foo, false}]),
     {error,
      {malformed_url, _, "http://2010:836B:4179::836B:4179/foobar.html"}} =
-	http_uri:parse("http://2010:836B:4179::836B:4179/foobar.html").
+    http_uri:parse("http://2010:836B:4179::836B:4179/foobar.html"),
+
+    {ok, {http,<<>>,<<"2010:836B:4179::836B:4179">>,80,<<"/foobar.html">>,<<>>}} =
+    http_uri:parse(<<"http://[2010:836B:4179::836B:4179]/foobar.html">>),
+    {ok, {http,<<>>,<<"[2010:836B:4179::836B:4179]">>,80,<<"/foobar.html">>,<<>>}} =
+    http_uri:parse(<<"http://[2010:836B:4179::836B:4179]/foobar.html">>,
+               [{ipv6_host_with_brackets, true}]),
+    {ok, {http,<<>>,<<"2010:836B:4179::836B:4179">>,80,<<"/foobar.html">>,<<>>}} =
+    http_uri:parse(<<"http://[2010:836B:4179::836B:4179]/foobar.html">>,
+               [{ipv6_host_with_brackets, false}]),
+    {ok, {http,<<>>,<<"2010:836B:4179::836B:4179">>,80,<<"/foobar.html">>,<<>>}} =
+    http_uri:parse(<<"http://[2010:836B:4179::836B:4179]/foobar.html">>,
+               [{foo, false}]),
+    {error,
+     {malformed_url, _, <<"http://2010:836B:4179::836B:4179/foobar.html">>}} =
+    http_uri:parse(<<"http://2010:836B:4179::836B:4179/foobar.html">>).
 
 host(Config) when is_list(Config) ->
     {ok, {http,[],"localhost",8888,"/foobar.html",[]}} =
-	http_uri:parse("http://localhost:8888/foobar.html").
+    http_uri:parse("http://localhost:8888/foobar.html"),
+
+    {ok, {http,<<>>,<<"localhost">>,8888,<<"/foobar.html">>,<<>>}} =
+    http_uri:parse(<<"http://localhost:8888/foobar.html">>).
 
 userinfo(Config) when is_list(Config) ->
     {ok, {http,"nisse:foobar","localhost",8888,"/foobar.html",[]}} =
-	http_uri:parse("http://nisse:foobar@localhost:8888/foobar.html").
+    http_uri:parse("http://nisse:foobar@localhost:8888/foobar.html"),
+
+    {ok, {http,<<"nisse:foobar">>,<<"localhost">>,8888,<<"/foobar.html">>,<<>>}} =
+    http_uri:parse(<<"http://nisse:foobar@localhost:8888/foobar.html">>).
 
 scheme(Config) when is_list(Config) ->
     {error, no_scheme} = http_uri:parse("localhost/foobar.html"),
     {error, {malformed_url, _, _}} =
-	http_uri:parse("localhost:8888/foobar.html").
+    http_uri:parse("localhost:8888/foobar.html"),
+
+    {error, no_scheme} = http_uri:parse(<<"localhost/foobar.html">>),
+    {error, {malformed_url, _, _}} =
+    http_uri:parse(<<"localhost:8888/foobar.html">>).
 
 queries(Config) when is_list(Config) ->
     {ok, {http,[],"localhost",8888,"/foobar.html","?foo=bar&foobar=42"}} =
-	http_uri:parse("http://localhost:8888/foobar.html?foo=bar&foobar=42").
+    http_uri:parse("http://localhost:8888/foobar.html?foo=bar&foobar=42"),
+
+    {ok, {http,<<>>,<<"localhost">>,8888,<<"/foobar.html">>,<<"?foo=bar&foobar=42">>}} =
+    http_uri:parse(<<"http://localhost:8888/foobar.html?foo=bar&foobar=42">>).
 
 fragments(Config) when is_list(Config) ->
     {ok, {http,[],"localhost",80,"/",""}} =
@@ -142,6 +175,41 @@ fragments(Config) when is_list(Config) ->
         http_uri:parse("http://localhost?query#", [{fragment,true}]),
     {ok, {http,[],"localhost",80,"/path","?query","#"}} =
         http_uri:parse("http://localhost/path?query#", [{fragment,true}]),
+
+
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<"">>}} =
+        http_uri:parse(<<"http://localhost#fragment">>),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/path">>,<<"">>}} =
+        http_uri:parse(<<"http://localhost/path#fragment">>),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<"?query">>}} =
+        http_uri:parse(<<"http://localhost?query#fragment">>),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/path">>,<<"?query">>}} =
+        http_uri:parse(<<"http://localhost/path?query#fragment">>),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<"">>,<<"#fragment">>}} =
+        http_uri:parse(<<"http://localhost#fragment">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/path">>,<<"">>,<<"#fragment">>}} =
+        http_uri:parse(<<"http://localhost/path#fragment">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<"?query">>,<<"#fragment">>}} =
+        http_uri:parse(<<"http://localhost?query#fragment">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/path">>,<<"?query">>,<<"#fragment">>}} =
+        http_uri:parse(<<"http://localhost/path?query#fragment">>,
+                       [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<"">>,<<"">>}} =
+        http_uri:parse(<<"http://localhost">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/path">>,<<"">>,<<"">>}} =
+        http_uri:parse(<<"http://localhost/path">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<"?query">>,<<"">>}} =
+        http_uri:parse(<<"http://localhost?query">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/path">>,<<"?query">>,<<"">>}} =
+        http_uri:parse(<<"http://localhost/path?query">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<"">>,<<"#">>}} =
+        http_uri:parse(<<"http://localhost#">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/path">>,<<"">>,<<"#">>}} =
+        http_uri:parse(<<"http://localhost/path#">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<"?query">>,<<"#">>}} =
+        http_uri:parse(<<"http://localhost?query#">>, [{fragment,true}]),
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/path">>,<<"?query">>,<<"#">>}} =
+        http_uri:parse(<<"http://localhost/path?query#">>, [{fragment,true}]),
     ok.
 
 escaped(Config) when is_list(Config) ->
@@ -152,7 +220,16 @@ escaped(Config) when is_list(Config) ->
     {ok, {http,[],"www.somedomain.com",80,"/%25abc",[]}} =
 	http_uri:parse("http://www.somedomain.com/%25abc"),
     {ok, {http,[],"www.somedomain.com",80,"/%25abc", "?foo=bar"}} =
-	http_uri:parse("http://www.somedomain.com/%25abc?foo=bar").
+    http_uri:parse("http://www.somedomain.com/%25abc?foo=bar"),
+
+    {ok, {http,<<>>,<<"www.somedomain.com">>,80,<<"/%2Eabc">>,<<>>}} =
+    http_uri:parse(<<"http://www.somedomain.com/%2Eabc">>),
+    {ok, {http,<<>>,<<"www.somedomain.com">>,80,<<"/%252Eabc">>,<<>>}} =
+    http_uri:parse(<<"http://www.somedomain.com/%252Eabc">>),
+    {ok, {http,<<>>,<<"www.somedomain.com">>,80,<<"/%25abc">>,<<>>}} =
+    http_uri:parse(<<"http://www.somedomain.com/%25abc">>),
+    {ok, {http,<<>>,<<"www.somedomain.com">>,80,<<"/%25abc">>, <<"?foo=bar">>}} =
+    http_uri:parse(<<"http://www.somedomain.com/%25abc?foo=bar">>).
 
 hexed_query(doc) ->
     [{doc, "Solves OTP-6191"}];
@@ -196,6 +273,17 @@ scheme_validation(Config) when is_list(Config) ->
 	http_uri:parse("https://localhost#fragment",
 		       [{scheme_validation_fun, none}]).
 
+encode_decode(Config) when is_list(Config) ->
+    ?assertEqual("foo%20bar", http_uri:encode("foo bar")),
+    ?assertEqual(<<"foo%20bar">>, http_uri:encode(<<"foo bar">>)),
+
+    ?assertEqual("foo bar", http_uri:decode("foo+bar")),
+    ?assertEqual(<<"foo bar">>, http_uri:decode(<<"foo+bar">>)),
+    ?assertEqual("foo bar", http_uri:decode("foo%20bar")),
+    ?assertEqual(<<"foo bar">>, http_uri:decode(<<"foo%20bar">>)),
+    ?assertEqual("foo\r\n", http_uri:decode("foo%0D%0A")),
+    ?assertEqual(<<"foo\r\n">>, http_uri:decode(<<"foo%0D%0A">>)).
+
 
 %%--------------------------------------------------------------------
 %% Internal Functions ------------------------------------------------