Fix handling of exceptions from layout

dougwilson · dougwilson · commit 19b90c4efa9f · 2019-09-27T10:21:58.000-04:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,6 +2,7 @@ unreleased
 ==========
 
   * Fix async helpers not working when cache enabled
+  * Fix handling of exceptions from layout
   * Fix handling of exceptions when cache enabled
   * deps: handlebars@4.1.2
   * deps: walk@2.3.14
diff --git a/lib/hbs.js b/lib/hbs.js
@@ -90,22 +90,27 @@ function middleware(filename, options, cb) {
   }
 
   // render with a layout
-  function render_with_layout(template, locals, cb) {
+  function render_with_layout (filename, template, locals, cb) {
     render_file(locals, function(err, str) {
       if (err) {
         return cb(err);
       }
 
       locals.body = str;
 
-      var res = template(locals, handlebarsOpts);
-      self.async.done(function(values) {
-        Object.keys(values).forEach(function(id) {
-          res = res.replace(id, values[id]);
-        });
+      try {
+        var res = template(locals, handlebarsOpts)
+        self.async.done(function (values) {
+          Object.keys(values).forEach(function (id) {
+            res = res.replace(id, values[id])
+          })
 
-        cb(null, res);
-      });
+          cb(null, res)
+        })
+      } catch (err) {
+        err.message = filename + ': ' + err.message
+        cb(err)
+      }
     });
   }
 
@@ -136,22 +141,12 @@ function middleware(filename, options, cb) {
     return view_path;
   });
 
-  var layout_template = layout_filename.reduce(function (cached, filename) {
-    if (cached) {
-      return cached;
-    }
-
-    var cached_file = cache[filename];
+  for (var i = 0; i < layout_filename.length; i++) {
+    var layout_template = cache[layout_filename[i]]
 
-    if (cached_file) {
-      return cache[filename];
+    if (layout_template) {
+      return render_with_layout(layout_filename[i], layout_template, options, cb)
     }
-
-    return undefined;
-  }, undefined);
-
-  if (layout_template) {
-    return render_with_layout(layout_template, options, cb);
   }
 
   // TODO check if layout path has .hbs extension
@@ -162,7 +157,7 @@ function middleware(filename, options, cb) {
       cache[filename] = layout_template;
     }
 
-    render_with_layout(layout_template, options, cb);
+    render_with_layout(filename, layout_template, options, cb)
   }
 
   function tryReadFileAndCache(templates) {
diff --git a/test/4.x/app.js b/test/4.x/app.js
@@ -144,6 +144,10 @@ before(function () {
     })
   })
 
+  app.get('/syntax-error-layout', function (req, res) {
+    res.render('blank', { layout: 'bad_layout' })
+  })
+
   app.get('/partials', function (req, res) {
     res.render('partials', { layout: false })
   })
@@ -225,6 +229,14 @@ test('syntax error cached', function (done) {
     .end(done)
 })
 
+test('syntax error layout', function (done) {
+  request(app)
+    .get('/syntax-error-layout')
+    .expect(500)
+    .expect(shouldHaveFirstLineEqual('Error: ' + path.join(__dirname, 'views', 'bad_layout.hbs') + ': Parse error on line 3:'))
+    .end(done)
+})
+
 test('escape for frontend', function(done) {
   request(app)
     .get('/escape')
diff --git a/test/4.x/views/bad_layout.hbs b/test/4.x/views/bad_layout.hbs
@@ -0,0 +1,9 @@
+<html>
+<head>
+  <title>{{title}</title>
+  <link rel='stylesheet' href='/stylesheets/style.css'>
+</head>
+<body>
+{{{body}}}
+</body>
+</html>
