URI decode user and password when parsing

Usernames and passwords in the amqp URI may be URI encoded. Ensure we
decode them during URI parse.

[#159650732]

Author: kjnilsson

src/amqp10_client.erl

@@ -347,10 +347,6 @@ parse_uri(Uri) ->
         Err -> Err
     end.
 
-parse_usertoken(U) ->
-    [User, Pass] = string:tokens(U, ":"),
-    {plain, to_binary(User), to_binary(Pass)}.
-
 parse_result({Scheme, UserInfo, Host, Port, "/", Query0}) ->
     Query = lists:foldl(fun (W, Acc) ->
                                 [K, V] = string:tokens(W, "="),
@@ -389,6 +385,12 @@ parse_result({Scheme, UserInfo, Host, Port, "/", Query0}) ->
             Ret0#{tls_opts => {secure_port, TlsOpts}}
     end.
 
+parse_usertoken(U) ->
+    [User, Pass] = string:tokens(U, ":"),
+    {plain,
+     to_binary(http_uri:decode(User)),
+     to_binary(http_uri:decode(Pass))}.
+
 
 safe_substr(Str, Start) when length(Str) >= Start ->
     string:substr(Str, Start);
@@ -454,6 +456,12 @@ parse_uri_test_() ->
                           sasl => {plain, <<"fred">>, <<"passw">>}}},
                    parse_uri("amqps://fred:passw@my_proxy:9876?sasl=plain&" ++
                              "hostname=my_host&max_frame_size=512&idle_time_out=60000")),
+     %% ensure URI encoded usernames and passwords are decodeded
+     ?_assertEqual({ok, #{address => "my_proxy",
+                          port => 9876,
+                          hostname => <<"my_proxy">>,
+                          sasl => {plain, <<"fr/ed">>, <<"pa/ssw">>}}},
+                   parse_uri("amqp://fr%2Fed:pa%2Fssw@my_proxy:9876")),
      %% make sasl plain implicit when username and password is present
      ?_assertEqual({ok, #{address => "my_proxy",
                           port => 9876,