Merge branch 'feature-https-new' into develop

* feature-https-new:
  Allow regular strings and objects as SSL options.
  Remove protocol setting in favor of baseURL.
  Add localhost testing certificate.
  Added baseUrl protocol preference
  Added defaults
  Added HTTPS support

Author: RubenVerborgh

bin/ldf-server

@@ -20,12 +20,14 @@ var configDefaults = JSON.parse(fs.readFileSync(path.join(__dirname, '../config/
     config = _.defaults(JSON.parse(fs.readFileSync(args[0])), configDefaults),
     port = parseInt(args[1], 10) || config.port,
     workers = parseInt(args[2], 10) || config.workers,
+    protocolMatch = (config.baseURL || '').match(/^(\w+):/),
+    protocol = config.protocol = protocolMatch ? protocolMatch[1] : 'http',
     constructors = {};
 
 // Start up a cluster master
 if (cluster.isMaster) {
   // Create workers
-  console.log('Master %d running on http://localhost:%d/.', process.pid, port);
+  console.log('Master %d running on %s://localhost:%d/.', process.pid, protocol, port);
   for (var i = 0; i < workers; i++)
     cluster.fork();
 
@@ -170,7 +172,7 @@ else {
   function startWhenReady() {
     if (!--pending) {
       server.listen(port);
-      console.log('Worker %d running on http://localhost:%d/.', process.pid, port);
+      console.log('Worker %d running on %s://localhost:%d/.', process.pid, protocol, port);
     }
   }
 

config/config-defaults.json

@@ -47,5 +47,13 @@
     ]
   },
 
+  "ssl": {
+    "keys" : {
+      "key":  "config/localhost.key",
+      "cert": "config/localhost.crt",
+      "ca": []
+    }
+  },
+
   "logging": { "enabled": false, "file": "access.log" }
 }

config/localhost.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE/TCCAuWgAwIBAgIJANiezJPdtqmLMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAgFw0xNjA5MjYwODI5MTRaGA8yMTE2MDkwMjA4MjkxNFow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAqkOBZUTxnRl2r95BLFb2rHFtm/68mqm9zYPvk4q/Oz/ubKVaDo1JFPSO
+94fKVAcLlZErM4tc4XJxSfYP0B4vBRqzY/T1APU2BIcHXkByrc1Z65Gx4uJAR5LM
+v1aLoPFhAufcGHn7uQbyiF8wk2z1NfsbGtgS515d2+MikLmKUDyh+lRxn+ax31kZ
+Adv4kmbCrdKhvNUutqsomJdYPgsoZxDHCKsFjx8pjKITv0OBlART8kVUsyTnnODV
+ifDOM2bvawetem5J3n/l6f62JI2NkANirJm0+YwgDBwjp8GE1smg+7vWNRuHBRFk
+B8h/qbwnWVX5RblX11BewdbnqkIX7W968esoDGvdZYq8Yu4bhpd8u2VEM/Yf2pEW
+n1/1d+K4/mzg3uNk6BCzaW9daVCotJeK93LAbFN/tpIr9ON/5tJSB3jiaUPlZcwL
+Tl+PQjjsNcBJwLYF3hup/G/0lhAp3TkohK1Q8CJOMm7MR8LcLysBR6KhCceqAEdX
+go/vtuaDFpxCGVvnJ5F8omynA/GuYiEgRWm26wSjLoG40QruPABUmR5QL8AZLAdX
+8zEKsl3RrFOptgEcPIl5rC5Q+D4jOy4nnyziAcDXSr1ZJhTbI764OhbETSCfw+Uy
+qb/wPSbmFgONWsYo2XCJnP2g0L1FjPyW3P+SLTgQsaCtESIdYJUCAwEAAaNQME4w
+HQYDVR0OBBYEFD24R76BIkz9kfv+2jvfxuinU06mMB8GA1UdIwQYMBaAFD24R76B
+Ikz9kfv+2jvfxuinU06mMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+AHmO4zfSOHMSHYYlPRgO3DJImbP/MDG3wDv2QRej3iZ65pu8Eu0qyRR3qt7aS+IT
+xkGSuFNeP2fYcQ8o2heWzyURzNtzkOOJotRPXQjgfjOLgc98VlEpJkYmh7up7WHk
+34cDl+87+p8mhxYfPwVs1Y67OhKt3Z3t5qvuJCnvCsCjzu8tIvNpwSIUc0QsQ6ty
+ddD4FnlYVepI4BOsAXlxPlPfnUMi0nMEQA5liRQIIWBCJ8COYhFo20uX4+CwVRnU
+uhy90Lh51fBV+/vG6d3LHfYnGC6nI5YCfgrSTNOwi8xjltJDh/7ifgE8nMDn6AN0
+hbVJKSFSgpEI/lnWsmsyngfpohLncsGM24F1iUTVng5pOUCBK0Hs5VgsEMW4WVHA
+SeB/Or/IUJ5a6DX/Hzgdb5wZ7fzTuoCl9ZQOxRDkuiSObUeXP00E+94cj2IEhxzx
+HSvN4HQyb7qRovfzt9kvKFk/GU4pFmjHIX/UhUisFL9TmibLQT4CpbLpoQdR2E3p
+VJ8MTV9LO3IbrRQilE78HzWpTNurnkbFUM/AG+SAkUgOTZrBj9lNfDcfDMqQPkVN
+oK6pLKQff3HAN4e6ZcfcjWyxjqjqxcvhJnKjkcEiZeEiLGL6GcnORogt/0YYMLeH
+GL8DU/OvuQDbrQY4i06JZb6Yk6mEda36Qm1YK0ttWmTv
+-----END CERTIFICATE-----

config/localhost.key

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJJwIBAAKCAgEAqkOBZUTxnRl2r95BLFb2rHFtm/68mqm9zYPvk4q/Oz/ubKVa
+Do1JFPSO94fKVAcLlZErM4tc4XJxSfYP0B4vBRqzY/T1APU2BIcHXkByrc1Z65Gx
+4uJAR5LMv1aLoPFhAufcGHn7uQbyiF8wk2z1NfsbGtgS515d2+MikLmKUDyh+lRx
+n+ax31kZAdv4kmbCrdKhvNUutqsomJdYPgsoZxDHCKsFjx8pjKITv0OBlART8kVU
+syTnnODVifDOM2bvawetem5J3n/l6f62JI2NkANirJm0+YwgDBwjp8GE1smg+7vW
+NRuHBRFkB8h/qbwnWVX5RblX11BewdbnqkIX7W968esoDGvdZYq8Yu4bhpd8u2VE
+M/Yf2pEWn1/1d+K4/mzg3uNk6BCzaW9daVCotJeK93LAbFN/tpIr9ON/5tJSB3ji
+aUPlZcwLTl+PQjjsNcBJwLYF3hup/G/0lhAp3TkohK1Q8CJOMm7MR8LcLysBR6Kh
+CceqAEdXgo/vtuaDFpxCGVvnJ5F8omynA/GuYiEgRWm26wSjLoG40QruPABUmR5Q
+L8AZLAdX8zEKsl3RrFOptgEcPIl5rC5Q+D4jOy4nnyziAcDXSr1ZJhTbI764OhbE
+TSCfw+Uyqb/wPSbmFgONWsYo2XCJnP2g0L1FjPyW3P+SLTgQsaCtESIdYJUCAwEA
+AQKCAgBeZcTkz5+heQ+rm+7IVYK3wr+BgG8y1K8ttVtrkr5JbD2VMOvIK578Jkbp
+h/iuM6XBi9XG4xpgyCF1Xx4PRdzN2Kri3VnE6S7EvdRg9hxerf6Ps5xLbSM0S3iH
+EMWjOpCNmt0VGPRt9iMbZqM46WzeO9UgQfHhIxmoorp0QNoleChZ8N16SN4PNYe+
+1yVujdibpK8VUaBvmF+OkkJTS75fvhaLgL45Ro6zsNx/6z55QRkFtliqZeifuqvJ
+qZ+5MfXFgmE1AtajrIdc/2Iey/hTgvz/Msz6mizeae9+v7UVnH5Lcy3lDdkC/0xV
+YF0fTvkF97uXY5YHA0E1+R9B7xjyG9VUe0Ztocjq7plC7BdbdCMTEHodIfTIcDvY
+s7LA959lw+t+ezCETH7ZdUI/uiY70rbzSpALS6pU2cPGHpq4c0Tg3mOCAw1WSYf8
+QGLZukKjOOyIxJ4B1tzbSI2qYq5IS82k29Q+nGvwadmlZfPcNbG4Lm13zv3N67nG
+x/OHM+ePJWVw5Bzmm5O2EnD1hxRSq/EYy3oM0WGiQAlZBxgjougSuRaLcUuHwFWa
+MEEuvFS76UfiZZXMKMIGjOGEmd4N+Canj46ZuCXKxu0NpMUY0IDr/DJvVNrSkA5L
+mZbtoN3pMOToKb9UqH5yJLgqTLLT4BnUmmbU981GRxF/45omIQKCAQEA4rkmqrdc
+CTqbbdMDd9XQN0v+VRMDEeWTwb3Yt094FriJ+H3tzrFBfvygS1KcozyztP+FsC2/
+CHxtyzqgT8uovvvZMUB+jM3ibTv7vfOSW6ITPuXors/b9D0cR3CboEuGlCdi4yYo
+/x0EJvk35/S5nuFF9OZOMIfHRIbqS8p+VTsprt68Fji7THSJP+lbmrBXW7ZMbiad
+rRvwhmwIyWDvqHtEZo58XZCTuYTtw24bbhN+/KCURBfHarLGws/jsJe0V3QFAgy/
+YkVMcVJOLmux5N2qvfUPEBXJ8eS5EkUFO5OlJvSjrE89ZCZ58+dr9DGlQ/D0Lqvh
+8U2XmsIGAg3PDQKCAQEAwD/01I1meAzs9rAqmpN4ZH+gSQxor0m5hoPTI8CI/DKj
+OlC0e/1Qwul6j59rHWsPPn9stGxSa+zay6FxFKG2WaRQn/6/BZV2y4OB1XZxgrIC
+zbWIOOBqdtoWbyz68uk3ibBy4XHisBszKFZlcLDQEI28HB8dt6/U8HhovSS6CJBT
+QAc95PuPP1f4GhWCPLpEAd+ZkVw0i6tRYyzfXMK7yhD+TZJAlC08J/6H5D/B7MCT
+84TMKrcZY+uvlBml8v1AA+/HwCJV6mDoVLjdw2ZPQMxRRIsoV1Tg0BBJd5rHliFp
+FbUCf3GAblrYyKY6y4HwQQJ7pMNhePPw2oMX/yo1qQKCAQAQ5yjg1WbBMWNhHrhF
+eOVbGglOImq6LNmFOjgsAnq7huqSYiEWpdRyOTdiJjiTWvUy61H2PpLdeRlea3KE
+QHTGOFSK/Xnx2W+mITC1irFAr6arq8xbLBgD74JqORUBMGBKL12J/dBUpL8ogLAQ
+VQh5teXXSkxOBfFvRHe3StN8WzrSVLzFE1mza4TIBQfVUoxQxBiSpcJfo5OdEfTd
+vqJfd0E0PC89cofw7t4jEdRtsnpnLzmekf9GDyoOYB1jjwvc8UNmUbj7BJucXzyA
+7XqHy5btLpX+5wD1Tc4WdJrdRDat3tNNB2NWUiAJdRlxTTo7BH3P9PSVXumMmiaE
+hK8JAoIBACIDbsKoXcfBqa8fjfoZO0S0m9wwuNjCd3OIITQDHXlZUC3CF5yUPdSu
+UEPW1bG3vlO1YbsuKwrzNeavIn2e+s8zVhxois1nG0R4eOEWepDAA+T3SCmf8tYi
+UbPLxn5xqqTOthSS/KNhvJRXbM0aS0WSfgSPsMdN8aO1+fn05IEdX81FOrsnkrmH
+S9r5kThDUELwl4/zO0y2u8iLKN2Vinn+ta9tv8U3l5wP2WUVrq6/h62fAixQhsp5
+6W+Pdh/elJPduX6R1JeKG7DZoEqw8Darr3ksEbAZ0UieiREDLmqucJQpmU6I+0sL
+Aa3GU0KsM6Cc2tlUxAsNRcCzTuyTQDkCggEAdO4xF8vLgklOAtLKvVXSy0F/+lXf
+2r9StJT/FRmaftv3ZDyMV/wXjsfjXi0ecuiQ2Pm9km8d/wGGWCc/tpghMfZ9EVMu
+F0oaOoQ8NLwAbWU3qGVXcQ0FwRHdSN7IwG/A0JsyzgaXy7B0VzVw/nuHH1fsEDs5
+q/ODI/6pyvpFCgBBnTWXUfTxSwEJJMuPBNbvD24OgEtlqFGcrCH+tGjd1lEMrF3N
+wF/PvEgbiFratNTthw9UbL9TvoFe/6iYdNridQiZEBGVc/kfXglJkMySVhLGPKn7
+F7Tr1mo7KZHOcmKomu4f2Ygtn3MVOlYLoNtEaUgoF/0gEFwR7jPzZ2f3Xg==
+-----END RSA PRIVATE KEY-----

lib/LinkedDataFragmentsServer.js

@@ -1,15 +1,27 @@
 /*! @license MIT ©2014-2016 Ruben Verborgh - Ghent University / iMinds */
 /* LinkedDataFragmentsServer is an HTTP server that provides access to Linked Data Fragments */
 
-var http = require('http'),
-    _ = require('lodash'),
+var _ = require('lodash'),
+    fs = require('fs'),
     Util = require('./Util'),
     ErrorController = require('./controllers/ErrorController');
 
 // Creates a new LinkedDataFragmentsServer
 function LinkedDataFragmentsServer(options) {
-  // Create the HTTP server
-  var server = http.createServer(), sockets = 0;
+  // Create the HTTP(S) server
+  var server, sockets = 0;
+  switch (options.protocol) {
+  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];
 
@@ -117,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;

test/LinkedDataFragmentsServer-test.js

@@ -23,6 +23,7 @@ describe('LinkedDataFragmentsServer', function () {
       server = new LinkedDataFragmentsServer({
         controllers: [controller],
         log: sinon.stub(),
+        protocol: 'http',
         response: {
           headers: {
             'Access-Control-Allow-Origin': '*',
@@ -127,6 +128,7 @@ describe('LinkedDataFragmentsServer', function () {
       };
       server = new LinkedDataFragmentsServer({
         controllers: [controllerA, controllerB],
+        protocol: 'http',
         log: sinon.stub(),
       });
       client = request.agent(server);