Require a proper proxy, if one is supplied

Author: isaacs

lib/utils/default-config.js

@@ -17,7 +17,7 @@ module.exports =
   , "tar" : process.env.TAR || "tar"
   , "gzipbin" : process.env.GZIPBIN || "gzip"
   , tag : "latest"
-  , proxy : process.env.http_proxy ? ("http://" + process.env.http_proxy) : null
+  , proxy : process.env.http_proxy || null
   , root : path.join(process.execPath, "..", "..", "lib", "node")
   , globalconfig : path.join(process.execPath, "..", "..", "etc", "npmrc")
   , userconfig : path.join(process.env.HOME, ".npmrc")

lib/utils/fetch.js

@@ -35,11 +35,19 @@ function fetchAndWrite (remote, fd, headers, maxRedirects, redirects, cb) {
   set(headers, "host", remote.hostname)
   remote.path = remote.pathname+(remote.search||"")+(remote.hash||"")
   var proxyConfig = npm.config.get("proxy")
-    , proxy = (proxyConfig) ? url.parse(proxyConfig) : null
-    , https = (proxy || remote).protocol === "https:"
+  if (proxyConfig) {
+    if (!proxyConfig.match(/^https?:\/\//)) {
+      proxyConfig = remote.protocol+"//"+proxyConfig
+    }
+    var proxy = (proxyConfig) ? url.parse(proxyConfig) : null
+    if (!proxy.host) return cb(new Error("Bad proxy config: "+proxyConfig))
+  }
+  var https = (proxy || remote).protocol === "https:"
     , port = (proxy || remote).port || (https ? 443 : 80)
     , hostname = (proxy || remote).hostname
-    , path = proxy ? remote.href : (remote.pathname||"/")+(remote.search||"")+(remote.hash||"")
+    , path = proxy ? remote.href : (remote.pathname||"/")
+                                 + (remote.search||"")
+                                 + (remote.hash||"")
   http
     .createClient(port, hostname, https)
     .request( "GET", path, headers)

lib/utils/registry/request.js

@@ -26,8 +26,14 @@ function request (method, where, what, cb) {
   where = url.resolve(npm.config.get("registry"), where)
   var u = url.parse(where)
     , proxyConfig = npm.config.get("proxy")
-    , proxy = (proxyConfig) ? url.parse(proxyConfig) : null
-    , https = (proxy || u).protocol === "https:"
+  if (proxyConfig) {
+    if (!proxyConfig.match(/^https?:\/\//)) {
+      proxyConfig = u.protocol+"//"+proxyConfig
+    }
+    var proxy = (proxyConfig) ? url.parse(proxyConfig) : null
+    if (!proxy.host) return cb(new Error("Bad proxy config: "+proxyConfig))
+  }
+  var https = (proxy || u).protocol === "https:"
     , port = (proxy || u).port || (https ? 443 : 80)
     , hostname = (proxy || u).hostname
     , client = http.createClient(port, hostname, https)