Only include the pathname in the 404 message

HISTORY.md

@@ -1,6 +1,7 @@
 unreleased
 ==========
 
+  * Only include the pathname in the 404 message
   * deps: [email protected]
     - Allow colors in workers
     - Deprecated `DEBUG_FD` environment variable

index.js

@@ -14,6 +14,7 @@
 var debug = require('debug')('finalhandler')
 var escapeHtml = require('escape-html')
 var onFinished = require('on-finished')
+var parseUrl = require('parseurl')
 var statuses = require('statuses')
 var unpipe = require('unpipe')
 
@@ -91,7 +92,7 @@ function finalhandler (req, res, options) {
         .replace(DOUBLE_SPACE_REGEXP, '  ') + '\n'
     } else {
       status = 404
-      msg = 'Cannot ' + escapeHtml(req.method) + ' ' + escapeHtml(req.originalUrl || req.url) + '\n'
+      msg = 'Cannot ' + escapeHtml(req.method) + ' ' + escapeHtml(parseUrl.original(req).pathname) + '\n'
     }
 
     debug('default %s', status)

package.json

@@ -9,6 +9,7 @@
     "debug": "2.6.0",
     "escape-html": "~1.0.3",
     "on-finished": "~2.3.0",
+    "parseurl": "~1.3.1",
     "statuses": "~1.3.1",
     "unpipe": "~1.0.0"
   },

test/test.js

@@ -188,19 +188,19 @@ describe('finalhandler(req, res)', function () {
   })
 
   describe('404 response', function () {
-    it('should include method and path', function (done) {
+    it('should include method and pathname', function (done) {
       request(createServer())
       .get('/foo')
       .expect(404, 'Cannot GET /foo\n', done)
     })
 
-    it('should escape method and path characters', function (done) {
+    it('should escape method and pathname characters', function (done) {
       rawrequest(createServer())
       .get('/<la\'me>')
       .expect(404, 'Cannot GET /&lt;la&#39;me&gt;\n', done)
     })
 
-    it('should include original URL', function (done) {
+    it('should include original pathname', function (done) {
       var server = createServer(function (req, res, next) {
         var parts = req.url.split('/')
         req.originalUrl = req.url
@@ -213,6 +213,12 @@ describe('finalhandler(req, res)', function () {
       .expect(404, 'Cannot GET /foo/bar\n', done)
     })
 
+    it('should include pathname only', function (done) {
+      rawrequest(createServer())
+      .get('http://localhost/foo?bar=1')
+      .expect(404, 'Cannot GET /foo\n', done)
+    })
+
     it('should handle HEAD', function (done) {
       request(createServer())
       .head('/foo')