Merge pull request #13 from DullReferenceException/allow-non-paths

Accept certs/keys/cas as contents

Author: indexzero

index.js

@@ -145,13 +145,9 @@ module.exports = function createServers(options, listening) {
       //
       // Load default SSL key, cert and ca(s).
       //
-      key: fs.readFileSync(path.resolve(ssl.root, ssl.key)),
-      cert: fs.readFileSync(path.resolve(ssl.root, ssl.cert)),
-      ca: ca && ca.map(
-          function (file) {
-            return fs.readFileSync(path.resolve(ssl.root, file));
-          }
-      ),
+      key: normalizeCertFile(ssl.root, ssl.key),
+      cert: normalizeCertFile(ssl.root, ssl.cert),
+      ca: ca && ca.map(normalizeCertFile.bind(null, ssl.root)),
       //
       // Properly expose ciphers for an A+ SSL rating:
       // https://certsimple.com/blog/a-plus-node-js-ssl
@@ -181,3 +177,13 @@ module.exports = function createServers(options, listening) {
   [createHttp, createHttps]
     .forEach(function (fn) { fn(); });
 };
+
+var pemFormat = /-----BEGIN/;
+
+function normalizeCertFile(root, file) {
+  if (typeof(file) !== 'string' || pemFormat.test(file)) {
+    return file; // Assumption that this is a Buffer, a PEM file, or something broken
+  }
+
+  return fs.readFileSync(path.resolve(root, file));
+}

test/create-servers-test.js

@@ -6,6 +6,7 @@
  */
 
 var path = require('path'),
+    fs = require('fs'),
     http = require('http'),
     https = require('https'),
     test = require('tape'),
@@ -176,6 +177,26 @@ test('http && https with different handlers', function (t) {
   });
 });
 
+test('supports cert contents instead of cert paths', function (t) {
+  t.plan(3);
+  var root = path.join(__dirname, 'fixtures');
+  createServers({
+    log: console.log,
+    https: {
+      port: 3456,
+      root: root,
+      cert: fs.readFileSync(path.resolve(root, 'agent2-cert.pem')),
+      key:  fs.readFileSync(path.resolve(root, 'agent2-key.pem'))
+    },
+    handler: fend
+  }, function (err, servers) {
+    t.error(err);
+    t.equals(typeof servers, 'object');
+    t.equals(typeof servers.https, 'object');
+    servers.https.close();
+  });
+});
+
 test('supports requestCert https option', function (t) {
   t.plan(2);
   var spy = sinon.spy(https, 'createServer');