Merge pull request #79 from seegno/feature/request-feature-detection

Add request feature detection

Author: mattrobenolt

lib/parsers.js

@@ -1,16 +1,17 @@
-var utils = require('./utils');
-var url = require('url');
 var cookie = require('cookie');
+var urlParser = require('url');
+var utils = require('./utils');
 
 module.exports.parseText = function parseText(message, kwargs) {
     kwargs = kwargs || {};
-    kwargs['message'] = message;
+    kwargs.message = message;
+
     return kwargs;
 };
 
 module.exports.parseError = function parseError(err, kwargs, cb) {
     utils.parseStack(err, function(frames) {
-        kwargs['message'] = err.name + ': ' + (err.message || '<no message>');
+        kwargs.message = err.name + ': ' + (err.message || '<no message>');
         kwargs['sentry.interfaces.Exception'] = {
             type: err.name,
             value:err.message
@@ -28,13 +29,13 @@ module.exports.parseError = function parseError(err, kwargs, cb) {
             }
         }
         if (extraErrorProps) {
-            kwargs['extra'] = kwargs['extra'] || {};
-            kwargs['extra'][err.name] = extraErrorProps;
+            kwargs.extra = kwargs.extra || {};
+            kwargs.extra[err.name] = extraErrorProps;
         }
 
         for (var n = frames.length - 1; n >= 0; n--) {
             if (frames[n].in_app) {
-                kwargs['culprit'] = utils.getCulprit(frames[n]);
+                kwargs.culprit = utils.getCulprit(frames[n]);
                 break;
             }
         }
@@ -45,7 +46,7 @@ module.exports.parseError = function parseError(err, kwargs, cb) {
 
 module.exports.parseQuery = function parseQuery(query, engine, kwargs) {
     kwargs = kwargs || {};
-    kwargs['message'] = query;
+    kwargs.message = query;
     kwargs['sentry.interfaces.Query'] = {
         query: query,
         engine: engine
@@ -56,23 +57,97 @@ module.exports.parseQuery = function parseQuery(query, engine, kwargs) {
 module.exports.parseRequest = function parseRequest(req, kwargs) {
     kwargs = kwargs || {};
 
-    // create absolute url
-    var host = req.headers.host || '<no host>';
-    var full_url = (req.socket.encrypted || 'https' === req.headers['x-forwarded-proto'] ? 'https' : 'http') + '://' + host + req.url;
+    // headers:
+    //
+    //   node: req.headers
+    //   express: req.headers
+    //   koa: req.header
+    //
+    var headers = req.headers || req.header || {};
+
+    // method:
+    //
+    //   node: req.method
+    //   express: req.method
+    //   koa: req.method
+    //
+    var method = req.method;
+
+    // host:
+    //
+    //   node: req.headers.host
+    //   express: req.host
+    //   koa: req.host
+    //
+    var host = req.host || headers.host || '<no host>';
+
+    // protocol:
+    //
+    //   node: <n/a>
+    //   express: req.protocol
+    //   koa: req.protocol
+    //
+    var protocol = ('https' === req.protocol || true === req.secure || true === (req.socket || {}).encrypted) ? 'https' : 'http';
+
+    // url (including path and query string):
+    //
+    //   node: req.originalUrl
+    //   express: req.originalUrl
+    //   koa: req.url
+    //
+    var originalUrl = req.originalUrl || req.url;
 
+    // absolute url
+    var url = protocol + '://' + host + originalUrl;
+
+    // query string
+    //
+    //   node: req.url (raw)
+    //   express: req.query
+    //   koa: req.query
+    //
+    var query = req.query || urlParser.parse(originalUrl || '', true).query;
+
+    // cookies:
+    //
+    //   node: req.headers.cookie
+    //   express: req.headers.cookie
+    //   koa: req.headers.cookie
+    //
+    var cookies = cookie.parse(headers.cookie || '');
+
+    // body data:
+    //
+    //   node: req.body
+    //   express: req.body
+    //   koa: req.body
+    //
+    var data = req.body || '<unavailable>';
+
+    // client ip:
+    //
+    //   node: req.connection.remoteAddress
+    //   express: req.ip
+    //   koa: req.ip
+    //
+    var ip = req.ip || (req.connection || {}).remoteAddress;
+
+    // http interface
     var http = {
-        method: req.method,
-        query_string: url.parse(req.url).query,
-        headers: req.headers,
-        cookies: req.cookies || cookie.parse(req.headers.cookies || ''),
-        data: req.body || '<unavailable>',
-        url: full_url,
+        method: method,
+        query_string: query,
+        headers: headers,
+        cookies: cookies,
+        data: data,
+        url: url,
         env: process.env
     };
 
-    var ip = (req.headers['x-forwarded-for'] || '').split(',')[0] ||
-             req.connection.remoteAddress;
+    // add remote ip
     http.env.REMOTE_ADDR = ip;
+
+    // expose http interface
     kwargs['sentry.interfaces.Http'] = http;
+
     return kwargs;
 };

package.json

@@ -1,7 +1,14 @@
 {
   "name": "raven",
   "description": "A standalone (Node.js) client for Sentry",
-  "keywords": ["raven", "sentry", "python", "errors", "debugging", "exceptions"],
+  "keywords": [
+    "raven",
+    "sentry",
+    "python",
+    "errors",
+    "debugging",
+    "exceptions"
+  ],
   "version": "0.6.3",
   "repository": "git://github.com/getsentry/raven-node.git",
   "author": "Matt Robenolt <[email protected]>",
@@ -17,21 +24,22 @@
     "node": ">= 0.6.0"
   },
   "dependencies": {
-    "node-uuid": "~1.4.1",
-    "stack-trace": "0.0.7",
+    "cookie": "0.1.0",
     "lsmod": "~0.0.3",
-    "cookie": "0.1.0"
+    "node-uuid": "~1.4.1",
+    "stack-trace": "0.0.7"
   },
   "devDependencies": {
-    "mocha": "*",
-    "should": "~3.3.1",
-    "nock": "*",
+    "coffee-script": "~1.7.1",
     "glob": "*",
+    "mocha": "*",
     "mock-udp": "*",
-    "coffee-script": "~1.7.1"
+    "nock": "*",
+    "should": "~3.3.1"
   },
   "optionalDependencies": {
     "connect": "*",
-    "express": "*"
+    "express": "*",
+    "koa": "*"
   }
 }