Merge pull request #1756 from ferd/handle-schemeless-proxy

Handle Schema-less Proxy URLs in ENV vars

1 files changed, 9 insertions, 1 deletions

diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 9bbe54e..a911cc2 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -854,10 +854,18 @@ set_httpc_options(_, []) ->
     ok;
 
 set_httpc_options(Scheme, Proxy) ->
-    {ok, {_, UserInfo, Host, Port, _, _}} = http_uri:parse(Proxy),
+    URI = normalise_proxy(Scheme, Proxy),
+    {ok, {_, UserInfo, Host, Port, _, _}} = http_uri:parse(URI),
     httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar),
     set_proxy_auth(UserInfo).
 
+normalise_proxy(Scheme, URI) ->
+    case re:run(URI, "://", [unicode]) of
+        nomatch when Scheme =:= https_proxy -> "https://" ++ URI;
+        nomatch when Scheme =:= proxy -> "http://" ++ URI;
+        _ -> URI
+    end.
+
 url_append_path(Url, ExtraPath) ->
      case http_uri:parse(Url) of
          {ok, {Scheme, UserInfo, Host, Port, Path, Query}} ->