convert CA creation to async

Author: joeferner

lib/ca.js

@@ -1,6 +1,11 @@
+'use strict';
+
 var FS = require('fs');
+var path = require('path');
 var Forge = require('node-forge');
 var pki = Forge.pki;
+var mkdirp = require('mkdirp');
+var async = require('async');
 
 var CAattrs = [{
   name: 'commonName',
@@ -99,25 +104,33 @@ var ServerExtensions = [{
   name: 'subjectKeyIdentifier'
 }];
 
-var CA = function (caFolder) {
-  this.baseCAFolder = caFolder;
-  this.certsFolder = this.baseCAFolder + '/certs';
-  this.keysFolder = this.baseCAFolder + '/keys';
-  try {
-    FS.mkdirSync(this.baseCAFolder);
-  } catch (e) { /* no op */ }
-  try {
-    FS.mkdirSync(this.certsFolder);
-  } catch (e) { /* no op */ }
-  try {
-    FS.mkdirSync(this.keysFolder);
-  } catch (e) { /* no op */ }
-  try {
-    var stats = FS.statSync(this.certsFolder + '/ca.pem');
-    this.loadCA();
-  } catch (e) {
-    this.generateCA();
-  }
+var CA = function () {
+};
+
+CA.create = function (caFolder, callback) {
+  var ca = new CA();
+  ca.baseCAFolder = caFolder;
+  ca.certsFolder = path.join(ca.baseCAFolder, 'certs');
+  ca.keysFolder = path.join(ca.baseCAFolder, 'keys');
+  async.series([
+    mkdirp.bind(null, ca.baseCAFolder),
+    mkdirp.bind(null, ca.certsFolder),
+    mkdirp.bind(null, ca.keysFolder),
+    function (callback) {
+      FS.exists(path.join(ca.certsFolder, 'ca.pem'), function (exists) {
+        if (exists) {
+          ca.loadCA(callback);
+        } else {
+          ca.generateCA(callback);
+        }
+      });
+    }
+  ], function (err) {
+    if (err) {
+      return callback(err);
+    }
+    return callback(null, ca);
+  });
 };
 
 CA.prototype.randomSerialNumber = function () {
@@ -129,34 +142,55 @@ CA.prototype.randomSerialNumber = function () {
 	return sn;
 }
 
-CA.prototype.generateCA = function () {
-  var keys = pki.rsa.generateKeyPair(2048);
-  var cert = pki.createCertificate();
-  cert.publicKey = keys.publicKey;
-  cert.serialNumber = this.randomSerialNumber();
-  cert.validity.notBefore = new Date();
-  cert.validity.notAfter = new Date();
-  cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 10);
-  cert.setSubject(CAattrs);
-  cert.setIssuer(CAattrs);
-  cert.setExtensions(CAextensions);
-  cert.sign(keys.privateKey, Forge.md.sha256.create());
-  this.CAcert = cert;
-  this.CAkeys = keys;
-  FS.writeFileSync(this.certsFolder + '/ca.pem', pki.certificateToPem(cert));
-  FS.writeFileSync(this.keysFolder + '/ca.private.key', pki.privateKeyToPem(keys.privateKey));
-  FS.writeFileSync(this.keysFolder + '/ca.public.key', pki.publicKeyToPem(keys.publicKey));
+CA.prototype.generateCA = function (callback) {
+  var self = this;
+  pki.rsa.generateKeyPair({bits: 2048}, function(err, keys) {
+    if (err) {
+      return callback(err);
+    }
+    var cert = pki.createCertificate();
+    cert.publicKey = keys.publicKey;
+    cert.serialNumber = self.randomSerialNumber();
+    cert.validity.notBefore = new Date();
+    cert.validity.notAfter = new Date();
+    cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 10);
+    cert.setSubject(CAattrs);
+    cert.setIssuer(CAattrs);
+    cert.setExtensions(CAextensions);
+    cert.sign(keys.privateKey, Forge.md.sha256.create());
+    self.CAcert = cert;
+    self.CAkeys = keys;
+    async.parallel([
+      FS.writeFile.bind(null, path.join(self.certsFolder, 'ca.pem'), pki.certificateToPem(cert)),
+      FS.writeFile.bind(null, path.join(self.keysFolder, 'ca.private.key'), pki.privateKeyToPem(keys.privateKey)),
+      FS.writeFile.bind(null, path.join(self.keysFolder, 'ca.public.key'), pki.publicKeyToPem(keys.publicKey))
+    ], callback);
+  });
 };
 
-CA.prototype.loadCA = function () {
-  var certPEM = FS.readFileSync(this.certsFolder + '/ca.pem');
-  var keyPrivatePEM = FS.readFileSync(this.keysFolder + '/ca.private.key');
-  var keyPublicPEM = FS.readFileSync(this.keysFolder + '/ca.public.key');
-  this.CAcert = pki.certificateFromPem(certPEM);
-  this.CAkeys = {
-    privateKey: pki.privateKeyFromPem(keyPrivatePEM),
-    publicKey: pki.publicKeyFromPem(keyPublicPEM)
-  };
+CA.prototype.loadCA = function (callback) {
+  var self = this;
+  async.auto({
+    certPEM: function (callback) {
+      FS.readFile(path.join(self.certsFolder, 'ca.pem'), 'utf-8', callback);
+    },
+    keyPrivatePEM: function (callback) {
+      FS.readFile(path.join(self.keysFolder, 'ca.private.key'), 'utf-8', callback);
+    },
+    keyPublicPEM: function (callback) {
+      FS.readFile(path.join(self.keysFolder, 'ca.public.key'), 'utf-8', callback);
+    }
+  }, function (err, results) {
+    if (err) {
+      return callback(err);
+    }
+    self.CAcert = pki.certificateFromPem(results.certPEM);
+    self.CAkeys = {
+      privateKey: pki.privateKeyFromPem(results.keyPrivatePEM),
+      publicKey: pki.publicKeyFromPem(results.keyPublicPEM)
+    };
+    return callback();
+  });
 };
 
 CA.prototype.generateServerCertificateKeys = function (hosts, cb) {

lib/proxy.js

@@ -8,7 +8,6 @@ var util = require('util');
 var fs = require('fs');
 var path = require('path');
 var events = require('events');
-var mkdirps = require('mkdirps');
 var WebSocket = require('ws');
 var url = require('url');
 var os = require('os');
@@ -57,13 +56,13 @@ Proxy.prototype.listen = function(options, callback) {
   this.useNamedSocket = !!options.useNamedSocket;
   this.httpsPort = this.forceSNI ? options.httpsPort : undefined;
   this.sslCaDir = options.sslCaDir || path.resolve(process.cwd(), '.http-mitm-proxy');
-  this.ca = new ca(this.sslCaDir);
-  this.sslServers = {};
-  this.sslSemaphores = {};
-  mkdirps(this.sslCaDir, function(err) {
+  ca.create(this.sslCaDir, function(err, ca) {
     if (err) {
-      self._onError('CERT_DIRECTORY_CREATION', null, err);
+      return callback(err);
     }
+    self.ca = ca;
+    self.sslServers = {};
+    self.sslSemaphores = {};
     self.httpServer = http.createServer();
     self.httpServer.timeout = self.timeout;
     self.httpServer.on('error', self._onError.bind(self, 'HTTP_SERVER_ERROR', null));

package.json

@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "async": "^1.5.2",
-    "mkdirps": "0.0.0",
+    "mkdirp": "^0.5.1",
     "node-forge": "^0.6.38",
     "optimist": "^0.6.1",
     "semaphore": "^1.0.5",

test/01_proxy.js

@@ -45,7 +45,7 @@ var countString = function (str, substr, cb) {
 };
 
 describe('proxy', function () {
-  this.timeout(5000);
+  this.timeout(30000);
   var srvA = null;
   var srvB = null;
   var proxy = null;