Change non-numeric status code to 500

pillarjs · Jun 15, 2016 · 360c1a8 · 360c1a8
1 parent ab539c3
commit 360c1a8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,7 +1,7 @@
 unreleased
 ==========
 
-  * Change invalid status code to 500
+  * Change invalid or non-numeric status code to 500
   * Overwrite status message to match set status code
   * Set response headers from `err.headers` object
   * Use `statuses` instead of `http` module for status messages

diff --git a/index.js b/index.js
@@ -77,7 +77,7 @@ function finalhandler (req, res, options) {
       }
 
       // default status code to 500 if outside valid range
-      if (!status || status < 400 || status > 599) {
+      if (typeof status !== 'number' || status < 400 || status > 599) {
         status = 500
       }
 

diff --git a/test/test.js b/test/test.js
@@ -116,6 +116,14 @@ describe('finalhandler(req, res)', function () {
       .get('/')
       .expect(500, done)
     })
+
+    it('should ignore non-numeric err.status', function (done) {
+      request(createServer(createError('oops', {
+        status: 'oh no'
+      })))
+      .get('/')
+      .expect(500, done)
+    })
   })
 
   describeStatusMessage('status message', function () {
@@ -284,6 +292,18 @@ describe('finalhandler(req, res)', function () {
         .expect(503, done)
       })
 
+      it('should convert to 500 is not a number', function (done) {
+        var server = http.createServer(function (req, res) {
+          var done = finalhandler(req, res)
+          res.statusCode = 'oh no'
+          done(new Error('oops'))
+        })
+
+        request(server)
+        .get('/foo')
+        .expect(500, done)
+      })
+
       it('should override with err.status', function (done) {
         var server = http.createServer(function (req, res) {
           var done = finalhandler(req, res)