Allow regular strings and objects as SSL options.

Author: RubenVerborgh

lib/LinkedDataFragmentsServer.js

@@ -11,23 +11,17 @@ function LinkedDataFragmentsServer(options) {
   // Create the HTTP(S) server
   var server, sockets = 0;
   switch (options.protocol) {
-  case 'https':
-    var ssl = options.ssl || {};
-
-    var httpsOptions = _.mapValues(ssl.keys || {},
-      function (v) {
-        return _.isArray(v) ? _.map(v, function (w) { return fs.readFileSync(w, 'ascii'); }) :  fs.readFileSync(v, 'ascii');
-      });
-
-    server = require('https').createServer(httpsOptions);
-    break;
   case 'http':
     server = require('http').createServer();
     break;
+  case 'https':
+    var httpsOptions = _.mapValues((options.ssl || {}).keys || {}, readHttpsOption);
+    server = require('https').createServer(httpsOptions);
+    break;
   default:
     throw new Error('The configured protocol ' + options.protocol + ' is invalid.');
   }
-
+  // Copy over members
   for (var member in LinkedDataFragmentsServer.prototype)
     server[member] = LinkedDataFragmentsServer.prototype[member];
 
@@ -135,4 +129,17 @@ LinkedDataFragmentsServer.prototype.stop = function () {
   }, this);
 };
 
+// Reads the value of an option for the https module
+function readHttpsOption(value) {
+  // Read each value of an array
+  if (_.isArray(value))
+    return value.map(readHttpsOption);
+  // Certificates and keys can be strings or files
+  else if (_.isString(value) && fs.existsSync(value))
+    return fs.readFileSync(value);
+  // Other strings and regular objects are also allowed
+  else
+    return value;
+}
+
 module.exports = LinkedDataFragmentsServer;