Use tunnel-agent for proxying https request

Author: ndmanvar

lib/transports.js

@@ -6,9 +6,12 @@ var timeoutReq = require('timed-out');
 
 var http = require('http');
 var https = require('https');
-var Tls = require('tls');
+var tunnel = require('tunnel-agent');
 
-var agentOptions = {keepAlive: true, maxSockets: 100};
+var agentOptions = {
+  keepAlive: true,
+  maxSockets: 100
+};
 var httpAgent = new http.Agent(agentOptions);
 var httpsAgent = new https.Agent(agentOptions);
 
@@ -22,7 +25,7 @@ function HTTPTransport(options) {
   this.agent = httpAgent;
 }
 util.inherits(HTTPTransport, Transport);
-HTTPTransport.prototype.send = function(client, message, headers, eventId, cb) {
+HTTPTransport.prototype.send = function (client, message, headers, eventId, cb) {
 
   var options = {
     hostname: client.dsn.host,
@@ -34,14 +37,17 @@ HTTPTransport.prototype.send = function(client, message, headers, eventId, cb) {
     agent: this.agent
   };
 
-  // set path apprpriately when using proxy
-  if (this.options.hasOwnProperty('host')) {
-      if (client.dsn.protocol === 'http') {
-        options.path = 'http://' + client.dsn.host + ':' + client.dsn.port + client.dsn.path + 'api/' + client.dsn.project_id + '/store/'
-      } else {
-        options.path = client.dsn.host + ':' + client.dsn.port;
-      }
+  // set path apprpriately when using http endpoint + proxy, set proxy headers appropriately when using https endpoint + proxy
+  if (this.options.hasOwnProperty('proxyHost')) {
+    if (client.dsn.protocol === 'http') {
+      options.path = 'http://' + client.dsn.host + ':' + client.dsn.port + client.dsn.path + 'api/' + client.dsn.project_id + '/store/';
       delete options.hostname; // only 'host' should be set when using proxy
+    } else {
+      this.options.agent.proxyOptions.headers = {
+        'Content-Type': 'application/octet-stream',
+        host: client.dsn.host + ':' + client.dsn.port
+      }
+    }
   }
 
   for (var key in this.options) {
@@ -50,16 +56,7 @@ HTTPTransport.prototype.send = function(client, message, headers, eventId, cb) {
     }
   }
 
-  // prevent off heap memory explosion
-  var _name = this.agent.getName({host: client.dsn.host, port: client.dsn.port});
-  var _requests = this.agent.requests[_name];
-  if (_requests && Object.keys(_requests).length > client.maxReqQueueCount) {
-    // other feedback strategy
-    client.emit('error', new Error('client req queue is full..'));
-    return;
-  }
-
-  var req = this.transport.request(options, function(res) {
+  var req = this.transport.request(options, function (res) {
     res.setEncoding('utf8');
     if (res.statusCode >= 200 && res.statusCode < 300) {
       client.emit('logged', eventId);
@@ -76,68 +73,52 @@ HTTPTransport.prototype.send = function(client, message, headers, eventId, cb) {
       client.emit('error', e);
       cb && cb(e);
     }
-
     // force the socket to drain
-    var noop = function() {};
+    var noop = function () {};
     res.on('data', noop);
     res.on('end', noop);
   });
 
   timeoutReq(req, client.sendTimeout * 1000);
 
   var cbFired = false;
-  req.on('error', function(e) {
+  req.on('error', function (e) {
     client.emit('error', e);
     if (!cbFired) {
       cb && cb(e);
       cbFired = true;
     }
   });
 
-  // TLS connection for proxying to HTTPS endpoint
-  /* req.on('connect', function (res, socket, head) {
-      var cts = Tls.connect({
-      host: client.dsn.host,
-      socket: socket
-      }, function () {
-          cts.write('GET /welcome HTTP/1.1rnHost: sentry.iornrn');
-      });
-
-      cts.on('data', function (data) {
-          // console.log(data.toString());
-      });
-  });
-  req.end(); */
-  
   req.end(message);
 };
 
 function HTTPSTransport(options) {
   this.defaultPort = 443;
   this.transport = https;
   this.options = options || {};
-  this.agent = httpsAgent;
 }
 
 function HTTPProxyTransport(options) {
-    // this.defaultPort = 80;
-    this.transport = http;
-    this.options = options || {};
-
-    // set host and port for proxy
-    this.options.host = options.proxyHost;
-    this.options.port = options.proxyPort;
+  // this.defaultPort = 80;
+  this.transport = http;
+  this.options = options || {};
+  this.options.host = options.proxyHost;
+  this.options.port = options.proxyPort;
 }
 
 function HTTPSProxyTransport(options) {
-    // Not working yet ):
-    this.defaultPort = 443;
-    this.transport = http;
-    this.options = options || {};
-    
-    this.options.host = options.proxyHost;
-    this.options.port = options.proxyPort;
-    this.options.method = 'CONNECT';
+  this.transport = https;
+  this.options = options || {};
+  this.options.agent = tunnel['httpsOverHttp']({
+    proxy: {
+      host: options.proxyHost,
+      port: options.proxyPort,
+      proxyAuth: null // TODO: Add ability to specify creds/auth
+    },
+    keepAlive: agentOptions.keepAlive,
+    maxSockets: agentOptions.maxSockets
+  });
 }
 
 util.inherits(HTTPSTransport, HTTPTransport);

package.json

@@ -34,6 +34,7 @@
     "lsmod": "1.0.0",
     "stack-trace": "0.0.9",
     "timed-out": "4.0.1",
+    "tunnel-agent": "^0.6.0",
     "uuid": "3.0.0"
   },
   "devDependencies": {