Custom error handling

Martin Martinez Rivera · Martin Martinez Rivera · commit c5d45c070a3d · 2015-08-05T22:18:08.000-04:00
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -79,6 +79,14 @@ var argv = require('nomnom')
     help: 'Suffix for SSE files (default: \'.events\')',
     abbr: 'sE'
   })
+  .option('noErrorPages', {
+    full: 'no-error-pages',
+    help: 'Disable custom error pages (use Node.js default pages instead)'
+  })
+  .option('errorPages', {
+    full: 'error-pages',
+    help: 'Folder from which to look for custom error pages files (files must be named <error-code>.html -- eg. 500.html)'
+  })
   .parse();
 
 // Print version and leave
diff --git a/index.js b/index.js
@@ -32,6 +32,9 @@ var putHandler = require('./lib/handlers/put.js');
 var deleteHandler = require('./lib/handlers/delete.js');
 var patchHandler = require('./lib/handlers/patch.js');
 
+// Error page handler
+var errorHandler = require('./lib/error.js');
+
 function ldnode (argv) {
     var ldp = new LDP(argv);
     var app = express();
@@ -70,6 +73,11 @@ function createServer(argv) {
     var ldp = ldpApp.locals.ldp;
     app.use(ldp.mount, ldpApp);
 
+    //Error handling
+    app.use(errorHandler.handler);
+
+    app.locals.ldp = ldp;
+
     if (ldp && (ldp.webid || ldp.key || ldp.cert) ) {
         debug.settings("SSL Private Key path: " + ldp.key);
         debug.settings("SSL Certificate path: " + ldp.cert);
diff --git a/lib/error.js b/lib/error.js
@@ -0,0 +1,29 @@
+/*jslint node: true*/
+"use strict";
+
+var fs = require('fs');
+
+function errorPageHandler(err, req, res, next) {
+    var ldp = req.app.locals.ldp;
+    if (ldp.customErrorPages) {
+        var errorPage = ldp.errorPages +
+                err.status.toString() + '.html';
+        fs.readFile(errorPage, 'utf8', function(readErr, text) {
+            if (readErr) {
+                defaultErrorHandler(err, res);
+            } else {
+                res.status(err.status);
+                res.send(text);
+            }
+        });
+    } else {
+        defaultErrorHandler(err, res);
+    }
+}
+
+function defaultErrorHandler(err, res) {
+    res.status(err.status);
+    res.send(err.message);
+}
+
+exports.handler = errorPageHandler;
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -27,6 +27,10 @@ function LDP(argv) {
   ldp.cache = argv.cache;
   ldp.live = argv.live;
   ldp.root = argv.root || process.cwd();
+  // Add trailing /
+  if (!(S(ldp.root).endsWith('/'))) {
+    ldp.root += '/';
+  }
   ldp.port = argv.port;
   ldp.secret = argv.secret;
   ldp.cert = argv.cert;
@@ -48,10 +52,6 @@ function LDP(argv) {
   ldp.suffixChanges = argv.suffixChanges || '.changes';
   ldp.suffixSSE = argv.suffixSSE || '.events';
 
-  if (!(S(ldp.root).endsWith('/'))) {
-      ldp.root += '/';
-  }
-
   ldp.pathFilter = regexp().start(ldp.mount).toRegExp();
   ldp.xssProxy = argv.xssProxy;
   ldp.proxyFilter = regexp().start(ldp.xssProxy).toRegExp();
@@ -61,6 +61,15 @@ function LDP(argv) {
   ldp.SSEsubscriptions = {};
   ldp.subscriptions = {};
 
+  // Error pages folder
+  ldp.customErrorPages = !argv.noErrorPages;
+  if (ldp.customErrorPages) {
+    ldp.errorPages = argv.errorPages || ldp.root + 'errorPages/';
+    if (!S(ldp.errorPages).endsWith('/')) {
+      ldp.errorPages += '/';
+    }
+  }
+
   debug.settings("mount: " + ldp.mount);
   debug.settings("root: " + ldp.root);
   debug.settings("URI path filter regexp: " + ldp.pathFilter);
