From 9993d349a8abcb7ba07bebcc8cc71ecec291ca68 Mon Sep 17 00:00:00 2001 From: Ross Schlaikjer Date: Mon, 2 Jul 2018 10:26:15 -0400 Subject: Do not assert that new URI port is same as old port When handling 301 redirects from http -> https on Erlang 21.0.1, the following error is encountered: ``` 8> Options = []. 9> httpc:request(head, {"http://rhye.org", []}, Options, []). {error,{shutdown,{{error,{badmatch,443}}, [{httpc_response,resolve_uri,7, [{file,"/usr/local/lib/erlang/lib/inets-7.0/src/http_client/httpc_response.erl"}, {line,431}]}, {httpc_response,redirect,2, [{file,"/usr/local/lib/erlang/lib/inets-7.0/src/http_client/httpc_response.erl"}, {line,396}]}, {httpc_handler,handle_response,1, [{file,"httpc_handler.erl"},{line,1052}]}, {httpc_handler,handle_info,2, [{file,"httpc_handler.erl"},{line,283}]}, {gen_server,try_dispatch,4, [{file,"gen_server.erl"},{line,637}]}, {gen_server,handle_msg,6, [{file,"gen_server.erl"},{line,711}]}, {proc_lib,init_p_do_apply,3, [{file,"proc_lib.erl"},{line,249}]}]}}} ``` This seems to be caused by the following code in `resolve_uri`: ``` resolve_uri(Scheme, Host, Port, Path, Query, URI, Map0) -> case maps:is_key(scheme, URI) of true -> Port = get_port(URI) ``` The value of `Port` passed in to `resolve_uri` here is 80, since the original URL is http. However, since the redirected URL is https, the `get_port` call returns 443, which is not equal to 80, and crashes. Assigning to a new variable seems to fix redirects. --- lib/inets/src/http_client/httpc_response.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/inets/src') diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl index 0f3bd0a06d..0931f0b4d3 100644 --- a/lib/inets/src/http_client/httpc_response.erl +++ b/lib/inets/src/http_client/httpc_response.erl @@ -425,11 +425,11 @@ resolve_uri(Scheme, Host, Port, Path, Query, URI) -> resolve_uri(Scheme, Host, Port, Path, Query, URI, Map0) -> case maps:is_key(scheme, URI) of true -> - Port = get_port(URI), + Port0 = get_port(URI), maybe_add_query( Map0#{scheme => maps:get(scheme, URI), host => maps:get(host, URI), - port => Port, + port => Port0, path => maps:get(path, URI)}, URI); false -> -- cgit v1.2.3 From de29bd57702c41c7d8ee463362dc64bc5bff0b70 Mon Sep 17 00:00:00 2001 From: Ross Schlaikjer Date: Tue, 3 Jul 2018 10:50:17 -0400 Subject: Fix accidental Port assertion in resolve_authority --- lib/inets/src/http_client/httpc_response.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/inets/src') diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl index 0931f0b4d3..dfb65a4083 100644 --- a/lib/inets/src/http_client/httpc_response.erl +++ b/lib/inets/src/http_client/httpc_response.erl @@ -457,10 +457,10 @@ get_default_port("https") -> resolve_authority(Host, Port, Path, Query, RelURI, Map) -> case maps:is_key(host, RelURI) of true -> - Port = get_port(RelURI), + Port0 = get_port(RelURI), maybe_add_query( Map#{host => maps:get(host, RelURI), - port => Port, + port => Port0, path => maps:get(path, RelURI)}, RelURI); false -> -- cgit v1.2.3 From cf43aba758ceeb1e4f313a2fdc1e901b9c1be06a Mon Sep 17 00:00:00 2001 From: Ross Schlaikjer Date: Tue, 3 Jul 2018 17:33:37 +0000 Subject: Update scheme on redirect URI and accumulator This is necessary to prevent an error when calling get_port inside resolve_authority --- lib/inets/src/http_client/httpc_response.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/inets/src') diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl index dfb65a4083..46073d47ec 100644 --- a/lib/inets/src/http_client/httpc_response.erl +++ b/lib/inets/src/http_client/httpc_response.erl @@ -434,7 +434,8 @@ resolve_uri(Scheme, Host, Port, Path, Query, URI, Map0) -> URI); false -> Map = Map0#{scheme => Scheme}, - resolve_authority(Host, Port, Path, Query, URI, Map) + URI1 = URI#{scheme => Scheme}, + resolve_authority(Host, Port, Path, Query, URI1, Map) end. -- cgit v1.2.3 From 3291b50bb2115008834b8ce0aa2521b1a4a04bc8 Mon Sep 17 00:00:00 2001 From: Ross Schlaikjer Date: Wed, 4 Jul 2018 08:13:20 -0400 Subject: Don't modify URI, explicitly pass scheme to get_port --- lib/inets/src/http_client/httpc_response.erl | 32 +++++++++++++--------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'lib/inets/src') diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl index 46073d47ec..78d6b4ed24 100644 --- a/lib/inets/src/http_client/httpc_response.erl +++ b/lib/inets/src/http_client/httpc_response.erl @@ -423,24 +423,24 @@ resolve_uri(Scheme, Host, Port, Path, Query, URI) -> resolve_uri(Scheme, Host, Port, Path, Query, URI, #{}). %% resolve_uri(Scheme, Host, Port, Path, Query, URI, Map0) -> - case maps:is_key(scheme, URI) of - true -> - Port0 = get_port(URI), + case maps:get(scheme, URI, undefined) of + undefined -> + Port0 = get_port(Scheme, URI), + Map = Map0#{scheme => Scheme, + port => Port0}, + resolve_authority(Host, Port, Path, Query, URI, Map); + URIScheme -> + Port0 = get_port(URIScheme, URI), maybe_add_query( - Map0#{scheme => maps:get(scheme, URI), - host => maps:get(host, URI), - port => Port0, - path => maps:get(path, URI)}, - URI); - false -> - Map = Map0#{scheme => Scheme}, - URI1 = URI#{scheme => Scheme}, - resolve_authority(Host, Port, Path, Query, URI1, Map) + Map0#{scheme => URIScheme, + host => maps:get(host, URI), + port => Port0, + path => maps:get(path, URI)}, + URI) end. -get_port(URI) -> - Scheme = maps:get(scheme, URI), +get_port(Scheme, URI) -> case maps:get(port, URI, undefined) of undefined -> get_default_port(Scheme); @@ -458,15 +458,13 @@ get_default_port("https") -> resolve_authority(Host, Port, Path, Query, RelURI, Map) -> case maps:is_key(host, RelURI) of true -> - Port0 = get_port(RelURI), maybe_add_query( Map#{host => maps:get(host, RelURI), - port => Port0, path => maps:get(path, RelURI)}, RelURI); false -> Map1 = Map#{host => Host, - port => Port}, + port => Port}, resolve_path(Path, Query, RelURI, Map1) end. -- cgit v1.2.3