Use tunnel-agent for proxying https request

Author: ndmanvar

lib/transports.js

@@ -6,7 +6,7 @@ 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 httpAgent = new http.Agent(agentOptions);
@@ -16,128 +16,106 @@ function Transport() {}
 util.inherits(Transport, events.EventEmitter);
 
 function HTTPTransport(options) {
-  this.defaultPort = 80;
-  this.transport = http;
-  this.options = options || {};
-  this.agent = httpAgent;
+    this.defaultPort = 80;
+    this.transport = http;
+    this.options = options || {};
+    this.agent = httpAgent;
 }
 util.inherits(HTTPTransport, Transport);
 HTTPTransport.prototype.send = function(client, message, headers, eventId, cb) {
 
-  var options = {
-    hostname: client.dsn.host,
-    path: client.dsn.path + 'api/' + client.dsn.project_id + '/store/',
-    headers: headers,
-    method: 'POST',
-    port: client.dsn.port || this.defaultPort,
-    ca: client.ca,
-    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;
-      }
-      delete options.hostname; // only 'host' should be set when using proxy
-  }
-
-  for (var key in this.options) {
-    if (this.options.hasOwnProperty(key)) {
-      options[key] = this.options[key];
+    var options = {
+        hostname: client.dsn.host,
+        path: client.dsn.path + 'api/' + client.dsn.project_id + '/store/',
+        headers: headers,
+        method: 'POST',
+        port: client.dsn.port || this.defaultPort,
+        ca: client.ca,
+        agent: this.agent
+    };
+
+    // 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
+            }
+        }
     }
-  }
-
-  // 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) {
-    res.setEncoding('utf8');
-    if (res.statusCode >= 200 && res.statusCode < 300) {
-      client.emit('logged', eventId);
-      cb && cb(null, eventId);
-    } else {
-      var reason = res.headers['x-sentry-error'];
-      var e = new Error('HTTP Error (' + res.statusCode + '): ' + reason);
-      e.response = res;
-      e.statusCode = res.statusCode;
-      e.reason = reason;
-      e.sendMessage = message;
-      e.requestHeaders = headers;
-      e.eventId = eventId;
-      client.emit('error', e);
-      cb && cb(e);
-    }
-
-    // force the socket to drain
-    var noop = function() {};
-    res.on('data', noop);
-    res.on('end', noop);
-  });
 
-  timeoutReq(req, client.sendTimeout * 1000);
-
-  var cbFired = false;
-  req.on('error', function(e) {
-    client.emit('error', e);
-    if (!cbFired) {
-      cb && cb(e);
-      cbFired = true;
+    for (var key in this.options) {
+        if (this.options.hasOwnProperty(key)) {
+            options[key] = this.options[key];
+        }
     }
-  });
-
-  // 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);
+
+    var req = this.transport.request(options, function(res) {
+        res.setEncoding('utf8');
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+            client.emit('logged', eventId);
+            cb && cb(null, eventId);
+        } else {
+            var reason = res.headers['x-sentry-error'];
+            var e = new Error('HTTP Error (' + res.statusCode + '): ' + reason);
+            e.response = res;
+            e.statusCode = res.statusCode;
+            e.reason = reason;
+            e.sendMessage = message;
+            e.requestHeaders = headers;
+            e.eventId = eventId;
+            client.emit('error', e);
+            cb && cb(e);
+        }
+        // force the socket to drain
+        var noop = function() {};
+        res.on('data', noop);
+        res.on('end', noop);
+    });
+
+    timeoutReq(req, client.sendTimeout * 1000);
+
+    var cbFired = false;
+    req.on('error', function(e) {
+        client.emit('error', e);
+        if (!cbFired) {
+            cb && cb(e);
+            cbFired = true;
+        }
+    });
+
+    req.end(message);
 };
 
 function HTTPSTransport(options) {
-  this.defaultPort = 443;
-  this.transport = https;
-  this.options = options || {};
-  this.agent = httpsAgent;
+    this.defaultPort = 443;
+    this.transport = https;
+    this.options = options || {};
 }
 
 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;
 }
 
 function HTTPSProxyTransport(options) {
-    // Not working yet ):
-    this.defaultPort = 443;
-    this.transport = http;
+    this.transport = https;
     this.options = options || {};
-    
-    this.options.host = options.proxyHost;
-    this.options.port = options.proxyPort;
-    this.options.method = 'CONNECT';
+    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": {