Add HTTPS request proxy support (#42)

* adding HTTPS request proxy support

* fix tunnel module resolution

Author: gregjhogan

api/HttpClient.ts

@@ -1,10 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+/// <reference path="../node/tunnel.d.ts"/>
+
 import url = require("url");
 
 import http = require("http");
 import https = require("https");
+import tunnel = require("tunnel");
 import ifm = require('./interfaces/common/VsoBaseInterfaces');
 
 http.globalAgent.maxSockets = 100;
@@ -95,43 +98,46 @@ export class HttpClient implements ifm.IHttpClient {
         this.isSsl = usingSsl;
 
         var proxyUrl: url.Url;
-        if (process.env.HTTP_PROXY) {
+        if (process.env.HTTPS_PROXY && usingSsl) {
+            proxyUrl = url.parse(process.env.HTTPS_PROXY);
+        } else if (process.env.HTTP_PROXY) {
             proxyUrl = url.parse(process.env.HTTP_PROXY);
-            prot = proxyUrl.protocol === 'https:' ? https: http;
         }
 
-        var options: any = { headers: {}};
+        var options: any = {
+            host: parsedUrl.hostname,
+            port: parsedUrl.port || defaultPort,
+            path: (parsedUrl.pathname || '') + (parsedUrl.search || ''),
+            method: method,
+            headers: headers || {}
+        };
+
+        //options.headers["Accept"] = contentType;
+        options.headers["User-Agent"] = this.userAgent;
 
         var useProxy = proxyUrl && proxyUrl.hostname;
         if (useProxy) {
-            // TODO: support proxy-authorization
-            options = {
-                host: proxyUrl.hostname,
-                port: proxyUrl.port || 8888,
-                path: requestUrl,
-                method: method,
-                headers: {}
-            }
-        }
-        else {
-            options = {
-                host: parsedUrl.hostname,
-                port: parsedUrl.port || defaultPort,
-                path: (parsedUrl.pathname || '') + (parsedUrl.search || ''),
-                method: method,
-                headers: {}
+            var agentOptions: tunnel.TunnelOptions = {
+                maxSockets: http.globalAgent.maxSockets,
+                proxy: {
+                    // TODO: support proxy-authorization
+                    //proxyAuth: "user:password",
+                    host: proxyUrl.hostname,
+                    port: proxyUrl.port
+                }
+            };
+
+            var tunnelAgent: Function;
+            var overHttps = proxyUrl.protocol === 'https:';
+            if (usingSsl) {
+                tunnelAgent = overHttps ? tunnel.httpsOverHttps : tunnel.httpsOverHttp;
+            } else {
+                tunnelAgent = overHttps ? tunnel.httpOverHttps : tunnel.httpOverHttp;
             }
+            
+            options.agent = tunnelAgent(agentOptions);
         }
 
-        options.headers = headers;
-
-        if (useProxy) {
-            options.headers['Host'] = parsedUrl.hostname;
-        }
-
-        //options.headers["Accept"] = contentType;
-        options.headers["User-Agent"] = this.userAgent;
-
         if (this.handlers) {
             this.handlers.forEach((handler) => {
                 handler.prepareRequest(options);

node/tunnel.d.ts

@@ -0,0 +1,22 @@
+declare module "tunnel" {
+    export interface TunnelAgent {
+    }
+    
+    export interface TunnelOptions {
+        maxSockets: number;
+        proxy: ProxyOptions;
+    }
+    
+    export interface ProxyOptions {
+        host: string;
+        port: string;
+        localAddress?: string;
+        proxyAuth?: string;
+        headers?: any;
+    }
+    
+    export function httpOverHttp(options: TunnelOptions): TunnelAgent;
+    export function httpOverHttps(options: TunnelOptions): TunnelAgent;
+    export function httpsOverHttp(options: TunnelOptions): TunnelAgent;
+    export function httpsOverHttps(options: TunnelOptions): TunnelAgent;
+}

package.json

@@ -22,7 +22,8 @@
   "license": "MIT",
   "dependencies": {
     "q": "^1.0.1",
-    "underscore": "^1.8.3"
+    "underscore": "^1.8.3",
+    "tunnel": "0.0.4"
   },
   "devDependencies": {
     "shelljs": "^0.7.0"