fix: properly handle non-errors thrown in domains

restify · Mar 13, 2019 · b953997 · b953997
1 parent 6259b24
commit b953997
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/server.js b/lib/server.js
@@ -1309,13 +1309,19 @@ Server.prototype._routeErrorResponse = function _routeErrorResponse(
             return;
         }
 
-        // Expose only knonw errors
-        if (_.isNumber(err.statusCode)) {
+        // only automatically send errors that are known (e.g., restify-errors)
+        if (err && _.isNumber(err.statusCode)) {
             res.send(err);
             return;
         }
 
-        res.send(new errors.InternalError(emitErr || err));
+        var finalErr = emitErr || err;
+        if (!(finalErr instanceof Error)) {
+            // if user land domain threw a string or number or any other
+            // non-error object, handle it here as best we can.
+            finalErr = (finalErr && finalErr.toString()) || '';
+        }
+        res.send(new errors.InternalError(finalErr));
     });
 };
 

diff --git a/test/server.test.js b/test/server.test.js
@@ -2505,9 +2505,10 @@ test('uncaughtException should handle thrown undefined literal', function(t) {
         }
     );
 
-    CLIENT.get('/foo', function(err, _, res) {
+    CLIENT.get('/foo', function(err, _, res, data) {
         t.ok(err);
         t.equal(res.statusCode, 500);
+        t.equal(data.message, '');
         t.end();
     });
 });
@@ -2535,8 +2536,9 @@ test('uncaughtException should handle thrown Number', function(t) {
         }
     );
 
-    CLIENT.get('/foo', function(err, _, res) {
+    CLIENT.get('/foo', function(err, _, res, data) {
         t.ok(err);
+        t.equal(data.message, '1');
         t.equal(res.statusCode, 500);
         t.end();
     });