@abtnode/certificate-manager 1.6.8 → 1.6.9

package/libs/acme-manager.js

@@ -3,12 +3,12 @@ const fs = require('fs');
 const path = require('path');
 const { Certificate } = require('@fidm/x509');
 const moment = require('moment');
+const md5 = require('@abtnode/util/lib/md5');
 
 const pkg = require('../package.json');
 const AcmeWrapper = require('./acme-wrapper');
 const { CERT_STATUS, CERT_SOURCE } = require('./constant');
 const createQueue = require('./queue');
-const { md5 } = require('./util');
 const logger = require('./logger');
 const states = require('../states');
 
@@ -45,9 +45,9 @@ class Manager extends EventEmitter {
         }
       },
       options: {
-        maxRetries: 5,
+        maxRetries: 3,
         retryDelay: 60 * 1000,
-        maxTimeout: 60 * 1000 * 5, // throw timeout error after 5 minutes
+        maxTimeout: 60 * 1000, // throw timeout error after 1 minutes
         id: (job) => (job ? md5(`${job.domain}-${job.challenge}`) : ''),
       },
     });
@@ -56,8 +56,9 @@ class Manager extends EventEmitter {
   getJobSchedular() {
     return {
       name: 'check-renewal-cert-job',
-      time: process.env.NODE_ENV === 'development' ? '0 * * * * *' : '0 */5 * * * *', // every 5 minutes
+      time: process.env.NODE_ENV === 'development' ? '0 * * * * *' : '0 */10 * * * *', // every 3 minutes
       fn: this.checkRenewalCerts.bind(this),
+      options: { runOnInit: false },
     };
   }
 
@@ -66,6 +67,11 @@ class Manager extends EventEmitter {
       throw new Error('domain is required when add domain');
     }
 
+    const existed = await states.certificate.findOne({ domain });
+    if (existed) {
+      return existed;
+    }
+
     const result = await states.certificate.insert({
       domain,
       source: CERT_SOURCE.letsEncrypt,
@@ -116,7 +122,7 @@ class Manager extends EventEmitter {
       let status = CERT_STATUS.creating;
 
       if (cert.certificate) {
-        const info = Certificate.fromPEM(cert.fullchain);
+        const info = Certificate.fromPEM(cert.certificate);
         const days = moment(info.validTo).diff(moment(), 'days');
 
         if (force === false && days > this.renewalOffsetInDay) {
@@ -150,14 +156,12 @@ class Manager extends EventEmitter {
         {
           source: CERT_SOURCE.letsEncrypt,
           status: CERT_STATUS.generated,
-          validTo: { $lte: moment().add(this.renewalOffsetInDay, 'days') },
+          'meta.validTo': { $lte: moment().add(this.renewalOffsetInDay, 'days').unix() * 1000 },
         },
       ],
     });
 
-    if (certs.length > 0) {
-      certs.forEach(({ domain }) => this.queue.push({ domain }));
-    }
+    certs.forEach(({ domain }) => this.queue.push({ domain }));
   }
 }
 
@@ -184,6 +188,7 @@ Manager.getInstance = async ({ maintainerEmail, baseDataDir }) => {
       { domain: data.subject },
       {
         $set: {
+          domain: data.subject,
           status: CERT_STATUS.generated,
           certificate: data.fullchain,
           privateKey: data.privkey,

package/libs/util.js

@@ -3,8 +3,6 @@ const fs = require('fs');
 const get = require('lodash.get');
 const { Certificate, PrivateKey } = require('@fidm/x509');
 
-const md5 = (str) => crypto.createHash('md5').update(str).digest('hex');
-
 const ensureDir = (dir) => {
   if (fs.existsSync(dir)) {
     return dir;
@@ -49,7 +47,6 @@ const validateCertificate = (cert, domain) => {
 const getCertInfo = (certificate) => {
   const info = Certificate.fromPEM(certificate);
 
-  const domain = info.subject.commonName.valueOf();
   const validFrom = info.validFrom.valueOf();
   const validTo = info.validTo.valueOf();
   const issuer = {
@@ -59,11 +56,9 @@ const getCertInfo = (certificate) => {
   };
 
   return {
-    domain,
     validFrom,
     validTo,
     issuer,
-    serialNumber: info.serialNumber,
     sans: info.dnsNames,
     validityPeriod: info.validTo - info.validFrom,
     fingerprintAlg: 'SHA256',
@@ -71,20 +66,4 @@ const getCertInfo = (certificate) => {
   };
 };
 
-const attachCertInfo = (certificates = []) => {
-  if (!certificates) {
-    return null;
-  }
-
-  if (Array.isArray(certificates)) {
-    return certificates.map((cert) => {
-      const info = cert.certificate ? getCertInfo(cert.certificate) : {};
-      return { ...cert, ...info };
-    });
-  }
-
-  const info = certificates.certificate ? getCertInfo(certificates.certificate) : {};
-  return { ...certificates, ...info };
-};
-
-module.exports = { md5, ensureDir, getFingerprint, validateCertificate, attachCertInfo };
+module.exports = { ensureDir, getFingerprint, validateCertificate, getCertInfo };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/certificate-manager",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "Manage ABT Node SSL certificates",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -24,17 +24,18 @@
   },
   "scripts": {
     "test": "echo \"Error: run tests from root\"",
-    "lint": "eslint libs routes states index.js",
+    "lint": "eslint libs routes sdk states validators index.js",
     "lint:fix": "eslint --fix tests lib"
   },
   "bugs": {
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/cron": "1.6.8",
-    "@abtnode/db": "1.6.8",
-    "@abtnode/logger": "1.6.8",
-    "@abtnode/queue": "1.6.8",
+    "@abtnode/cron": "1.6.9",
+    "@abtnode/db": "1.6.9",
+    "@abtnode/logger": "1.6.9",
+    "@abtnode/queue": "1.6.9",
+    "@abtnode/util": "1.6.9",
     "@fidm/x509": "^1.2.1",
     "@greenlock/manager": "^3.1.0",
     "@nedb/core": "^1.1.0",
@@ -54,5 +55,5 @@
     "punycode": "^2.1.1",
     "ursa-optional": "^0.10.2"
   },
-  "gitHead": "f97ec3a44250e034ff4b5e3f088c1417f448a7bb"
+  "gitHead": "372e95513bd9a510702d93650c0c004589579cb3"
 }

package/sdk/manager.js

@@ -4,7 +4,7 @@ const get = require('lodash.get');
 const Cron = require('@abtnode/cron');
 
 const AcmeManager = require('../libs/acme-manager');
-const { CERT_SOURCE, CERT_STATUS } = require('../libs/constant');
+const { CERT_SOURCE } = require('../libs/constant');
 const states = require('../states');
 const { validateAdd, validateUpdate, validateUpsertByDomain } = require('../validators/cert');
 const logger = require('../libs/logger');
@@ -49,7 +49,7 @@ class Manager extends EventEmitter {
           name: 'check-expired-certificates',
           time: '0 0 9 * * *', // check on 09:00 every day
           fn: this.checkCertificatesExpiration.bind(this),
-          options: { runOnInit: true },
+          options: { runOnInit: false },
         },
       ],
     });
@@ -86,12 +86,16 @@ class Manager extends EventEmitter {
 
   getAllNormal() {
     return states.certificate.find({
-      $or: [
-        { status: CERT_STATUS.generated },
-        {
-          source: CERT_SOURCE.upload,
-        },
-      ],
+      certificate: { $exists: true },
+      privateKey: { $exists: true },
+    });
+  }
+
+  getNormalByDomain(domain) {
+    return states.certificate.findOne({
+      domain,
+      certificate: { $exists: true },
+      privateKey: { $exists: true },
     });
   }
 
@@ -130,11 +134,6 @@ class Manager extends EventEmitter {
       throw new Error('domain is required');
     }
 
-    const existed = await states.certificate.findOne({ domain });
-    if (existed) {
-      throw new Error(`The name ${domain} already exists!`);
-    }
-
     return this.acmeManager.add(domain);
   }
 
@@ -175,6 +174,10 @@ class Manager extends EventEmitter {
   addWithoutValidations(data) {
     return states.certificate.insert(data);
   }
+
+  updateWithoutValidations(id, data) {
+    return states.certificate.update({ _id: id }, { $set: data });
+  }
 }
 
 module.exports = Manager;

package/states/certificate.js

@@ -1,6 +1,8 @@
+const get = require('lodash.get');
+
 const { CERT_STATUS } = require('../libs/constant');
 const BaseSate = require('./base');
-const { attachCertInfo } = require('../libs/util');
+const { getCertInfo } = require('../libs/util');
 
 class Certificate extends BaseSate {
   constructor(dataDir) {
@@ -15,14 +17,22 @@ class Certificate extends BaseSate {
     return super.update({ domain }, { $set: { status } });
   }
 
-  async find(...args) {
-    const result = await super.find(...args);
-    return attachCertInfo(result);
+  insert(data) {
+    if (data.certificate) {
+      data.meta = getCertInfo(data.certificate);
+    }
+
+    return super.insert(data);
   }
 
-  async findOne(...args) {
-    const result = await super.findOne(...args);
-    return attachCertInfo(result);
+  async update(condition, data, options) {
+    if (data.certificate) {
+      data.meta = getCertInfo(data.certificate);
+    } else if (get(data, '$set.certificate')) {
+      data.$set.meta = getCertInfo(get(data, '$set.certificate'));
+    }
+
+    return super.update(condition, data, options);
   }
 }