@certd/acme-client 0.1.6 → 0.2.0

package/src/auto.js

@@ -1,199 +1,203 @@
-/**
- * ACME auto helper
- */
-
-const Promise = require('bluebird');
-const logger = require('./util.log.js');
-
-const debug = logger.info;
-const forge = require('./crypto/forge');
-
-const defaultOpts = {
-    csr: null,
-    email: null,
-    preferredChain: null,
-    termsOfServiceAgreed: false,
-    skipChallengeVerification: false,
-    challengePriority: ['http-01', 'dns-01'],
-    challengeCreateFn: async () => { throw new Error('Missing challengeCreateFn()'); },
-    challengeRemoveFn: async () => { throw new Error('Missing challengeRemoveFn()'); }
-};
-
-
-function sleep(time) {
-    return new Promise((resovle) => {
-        setTimeout(() => {
-            resovle();
-        }, time);
-    });
-}
-/**
- * ACME client auto mode
- *
- * @param {AcmeClient} client ACME client
- * @param {object} userOpts Options
- * @returns {Promise<buffer>} Certificate
- */
-
-module.exports = async function(client, userOpts) {
-    const opts = Object.assign({}, defaultOpts, userOpts);
-    const accountPayload = { termsOfServiceAgreed: opts.termsOfServiceAgreed };
-
-    if (!Buffer.isBuffer(opts.csr)) {
-        opts.csr = Buffer.from(opts.csr);
-    }
-
-    if (opts.email) {
-        accountPayload.contact = [`mailto:${opts.email}`];
-    }
-
-
-    /**
-     * Register account
-     */
-
-    logger.info('[auto] Checking account');
-
-    try {
-        client.getAccountUrl();
-        logger.info('[auto] Account URL already exists, skipping account registration');
-    }
-    catch (e) {
-        logger.info('[auto] Registering account');
-        await client.createAccount(accountPayload);
-    }
-
-
-    /**
-     * Parse domains from CSR
-     */
-
-    logger.info('[auto] Parsing domains from Certificate Signing Request');
-    const csrDomains = await forge.readCsrDomains(opts.csr);
-    const domains = [csrDomains.commonName].concat(csrDomains.altNames);
-
-    logger.info(`[auto] Resolved ${domains.length} domains from parsing the Certificate Signing Request`);
-
-
-    /**
-     * Place order
-     */
-
-    logger.info('[auto] Placing new certificate order with ACME provider');
-    const orderPayload = { identifiers: domains.map((d) => ({ type: 'dns', value: d })) };
-    const order = await client.createOrder(orderPayload);
-    const authorizations = await client.getAuthorizations(order);
-
-    logger.info(`[auto] Placed certificate order successfully, received ${authorizations.length} identity authorizations`);
-
-
-    /**
-     * Resolve and satisfy challenges
-     */
-
-    logger.info('[auto] Resolving and satisfying authorization challenges');
-
-    // 获取challenge列表
-    const challengePromises = authorizations.map(async (authz) => {
-        const d = authz.identifier.value;
-
-        /* Select challenge based on priority */
-        const challenge = authz.challenges.sort((a, b) => {
-            const aidx = opts.challengePriority.indexOf(a.type);
-            const bidx = opts.challengePriority.indexOf(b.type);
-
-            if (aidx === -1) return 1;
-            if (bidx === -1) return -1;
-            return aidx - bidx;
-        }).slice(0, 1)[0];
-
-        if (!challenge) {
-            throw new Error(`Unable to select challenge for ${d}, no challenge found`);
-        }
-
-        logger.info(`[auto] [${d}] Found ${authz.challenges.length} challenges, selected type: ${challenge.type}`);
-
-        const keyAuthorization = await client.getChallengeKeyAuthorization(challenge);
-
-        return {
-            authz, keyAuthorization, domain: d, challenge
-        };
-    });
-
-    // 执行获取challenge信息列表
-    const challengeInfos = await Promise.all(challengePromises);
-
-
-    // 创建dns records 的promise
-    const challengeCreatePromises = challengeInfos.map(async (challengeInfo, index) => {
-        const { domain, authz, challenge, keyAuthorization } = challengeInfo;
-        try {
-            await sleep(index * 2000); // 延迟2秒再请求下一个
-            logger.info(`[auto] [${domain}] Trigger challengeCreateFn()`);
-            challengeInfo.record = await opts.challengeCreateFn(authz, challenge, keyAuthorization);
-            return challengeInfo;
-        }
-        catch (e) {
-            logger.error('challengeCreate error', e);
-            return e;
-        }
-    });
-
-    // 执行创建dns record
-    const challengeRecordInfos = await Promise.all(challengeCreatePromises);
-
-    try {
-        // 如果创建record有错误，直接报错
-        const hasError = challengeRecordInfos.filter((item) => item instanceof Error);
-        if (hasError.length > 0) {
-            throw new Error(hasError[0]);
-        }
-        // 等待30秒，尽量等dns记录更新到远端
-        logger.info('[auto] 等待30秒');
-        await sleep(30000);
-        // 开始验证
-        const verifys = challengeRecordInfos.map(async (challengeInfo) => {
-            const { domain, authz, challenge } = challengeInfo;
-            const d = domain;
-            /* Challenge verification */
-            if (opts.skipChallengeVerification === true) {
-                logger.info(`[auto] [${d}] Skipping challenge verification since skipChallengeVerification=true`);
-            }
-            else {
-                logger.info(`[auto] [${d}] Running challenge verification`);
-                await client.verifyChallenge(authz, challenge);
-            }
-
-            /* Complete challenge and wait for valid status */
-            logger.info(`[auto] [${d}] Completing challenge with ACME provider and waiting for valid status`);
-            await client.completeChallenge(challenge);
-            await client.waitForValidStatus(challenge);
-        });
-        logger.info('[auto] Waiting for challenge valid status');
-        await Promise.all(verifys);
-        // 验证成功
-        logger.info('[auto] challenge verify success');
-    }
-    finally {
-        // 删除record
-        const willRemovePromises = challengeRecordInfos.filter((item) => item && !(item instanceof Error)).map(async (challengeInfo, index) => {
-            await sleep(index * 2000); // 延迟2秒再请求下一个
-            const { authz, challenge, keyAuthorization, record, domain } = challengeInfo;
-            /* Trigger challengeRemoveFn(), suppress errors */
-            logger.info(`[auto] [${domain}] Trigger challengeRemoveFn()`);
-
-            try {
-                await opts.challengeRemoveFn(authz, challenge, keyAuthorization, record);
-            }
-            catch (e) {
-                logger.info(`[auto] [${domain}] challengeRemoveFn threw error: ${e.message}`);
-            }
-        });
-
-        await Promise.all(willRemovePromises);
-    }
-
-    logger.info('[auto] Finalizing order and downloading certificate');
-    await client.finalizeOrder(order, opts.csr);
-    return client.getCertificate(order, opts.preferredChain);
-};
+/**
+ * ACME auto helper
+ */
+
+const Promise = require('bluebird');
+const logger = require('./util.log.js');
+
+const debug = logger.info;
+const forge = require('./crypto/forge');
+
+const defaultOpts = {
+    csr: null,
+    email: null,
+    preferredChain: null,
+    termsOfServiceAgreed: false,
+    skipChallengeVerification: false,
+    challengePriority: ['http-01', 'dns-01'],
+    challengeCreateFn: async () => { throw new Error('Missing challengeCreateFn()'); },
+    challengeRemoveFn: async () => { throw new Error('Missing challengeRemoveFn()'); }
+};
+
+
+function sleep(time) {
+    return new Promise((resovle) => {
+        setTimeout(() => {
+            resovle();
+        }, time);
+    });
+}
+/**
+ * ACME client auto mode
+ *
+ * @param {AcmeClient} client ACME client
+ * @param {object} userOpts Options
+ * @returns {Promise<buffer>} Certificate
+ */
+
+module.exports = async function(client, userOpts) {
+    const opts = Object.assign({}, defaultOpts, userOpts);
+    const accountPayload = { termsOfServiceAgreed: opts.termsOfServiceAgreed };
+
+    if (!Buffer.isBuffer(opts.csr)) {
+        opts.csr = Buffer.from(opts.csr);
+    }
+
+    if (opts.email) {
+        accountPayload.contact = [`mailto:${opts.email}`];
+    }
+
+
+    /**
+     * Register account
+     */
+
+    logger.info('[auto] Checking account');
+
+    try {
+        client.getAccountUrl();
+        logger.info('[auto] Account URL already exists, skipping account registration');
+    }
+    catch (e) {
+        logger.info('[auto] Registering account');
+        await client.createAccount(accountPayload);
+    }
+
+
+    /**
+     * Parse domains from CSR
+     */
+
+    logger.info('[auto] Parsing domains from Certificate Signing Request');
+    const csrDomains = await forge.readCsrDomains(opts.csr);
+    const domains = [csrDomains.commonName].concat(csrDomains.altNames);
+
+    logger.info(`[auto] Resolved ${domains.length} domains from parsing the Certificate Signing Request`);
+
+
+    /**
+     * Place order
+     */
+
+    logger.info('[auto] Placing new certificate order with ACME provider');
+    const orderPayload = { identifiers: domains.map((d) => ({ type: 'dns', value: d })) };
+    const order = await client.createOrder(orderPayload);
+    const authorizations = await client.getAuthorizations(order);
+
+    logger.info(`[auto] Placed certificate order successfully, received ${authorizations.length} identity authorizations`);
+
+
+    /**
+     * Resolve and satisfy challenges
+     */
+
+    logger.info('[auto] Resolving and satisfying authorization challenges');
+
+    // 获取challenge列表
+    const challengePromises = authorizations.map(async (authz) => {
+        const d = authz.identifier.value;
+
+        /* Select challenge based on priority */
+        const challenge = authz.challenges.sort((a, b) => {
+            const aidx = opts.challengePriority.indexOf(a.type);
+            const bidx = opts.challengePriority.indexOf(b.type);
+
+            if (aidx === -1) return 1;
+            if (bidx === -1) return -1;
+            return aidx - bidx;
+        }).slice(0, 1)[0];
+
+        if (!challenge) {
+            throw new Error(`Unable to select challenge for ${d}, no challenge found`);
+        }
+
+        logger.info(`[auto] [${d}] Found ${authz.challenges.length} challenges, selected type: ${challenge.type}`);
+
+        const keyAuthorization = await client.getChallengeKeyAuthorization(challenge);
+
+        return {
+            authz, keyAuthorization, domain: d, challenge
+        };
+    });
+
+    // 执行获取challenge信息列表
+    const challengeInfos = await Promise.all(challengePromises);
+
+
+    // 创建dns records 的promise
+    const challengeCreatePromises = challengeInfos.map(async (challengeInfo, index) => {
+        const { domain, authz, challenge, keyAuthorization } = challengeInfo;
+        try {
+            await sleep(index * 2000); // 延迟2秒再请求下一个
+            logger.info(`[auto] [${domain}] Trigger challengeCreateFn()`);
+            challengeInfo.record = await opts.challengeCreateFn(authz, challenge, keyAuthorization);
+            return challengeInfo;
+        }
+        catch (e) {
+            logger.error('challengeCreate error', e);
+            return e;
+        }
+    });
+
+    // 执行创建dns record
+    const challengeRecordInfos = await Promise.all(challengeCreatePromises);
+
+    try {
+        // 如果创建record有错误，直接报错
+        const hasError = challengeRecordInfos.filter((item) => item instanceof Error);
+        if (hasError.length > 0) {
+            throw new Error(hasError[0]);
+        }
+        // 等待30秒，尽量等dns记录更新到远端
+        logger.info('[auto] 等待30秒');
+        await sleep(30000);
+        // 开始验证
+        const verifys = challengeRecordInfos.map(async (challengeInfo) => {
+            const { domain, authz, challenge } = challengeInfo;
+            const d = domain;
+            /* Challenge verification */
+            if (opts.skipChallengeVerification === true) {
+                logger.info(`[auto] [${d}] Skipping challenge verification since skipChallengeVerification=true`);
+            }
+            else {
+                logger.info(`[auto] [${d}] Running challenge verification`);
+                await client.verifyChallenge(authz, challenge);
+            }
+
+            /* Complete challenge and wait for valid status */
+            logger.info(`[auto] [${d}] Completing challenge with ACME provider and waiting for valid status`);
+            await client.completeChallenge(challenge);
+            await client.waitForValidStatus(challenge);
+        });
+        logger.info('[auto] Waiting for challenge valid status');
+        await Promise.all(verifys);
+        // 验证成功
+        logger.info('[auto] challenge verify success');
+    }
+    catch (e) {
+        logger.error('申请时出错:', e);
+        throw e;
+    }
+    finally {
+        // 删除record
+        const willRemovePromises = challengeRecordInfos.filter((item) => item && !(item instanceof Error)).map(async (challengeInfo, index) => {
+            await sleep(index * 2000); // 延迟2秒再请求下一个
+            const { authz, challenge, keyAuthorization, record, domain } = challengeInfo;
+            /* Trigger challengeRemoveFn(), suppress errors */
+            logger.info(`[auto] [${domain}] Trigger challengeRemoveFn()`);
+
+            try {
+                await opts.challengeRemoveFn(authz, challenge, keyAuthorization, record);
+            }
+            catch (e) {
+                logger.info(`[auto] [${domain}] challengeRemoveFn threw error: ${e.message}`);
+            }
+        });
+
+        await Promise.all(willRemovePromises);
+    }
+
+    logger.info('[auto] Finalizing order and downloading certificate');
+    await client.finalizeOrder(order, opts.csr);
+    return client.getCertificate(order, opts.preferredChain);
+};

package/src/axios.js

@@ -1,40 +1,40 @@
-/**
- * Axios instance
- */
-
-const axios = require('axios');
-const adapter = require('axios/lib/adapters/http');
-const pkg = require('./../package.json');
-
-
-/**
- * Instance
- */
-
-const instance = axios.create();
-
-/* Default User-Agent */
-instance.defaults.headers.common['User-Agent'] = `node-${pkg.name}/${pkg.version}`;
-
-/* Default ACME settings */
-instance.defaults.acmeSettings = {
-    httpChallengePort: 80,
-    bypassCustomDnsResolver: false
-};
-
-
-/**
- * Explicitly set Node as default HTTP adapter
- *
- * https://github.com/axios/axios/issues/1180
- * https://stackoverflow.com/questions/42677387
- */
-
-instance.defaults.adapter = adapter;
-
-
-/**
- * Export instance
- */
-
-module.exports = instance;
+/**
+ * Axios instance
+ */
+
+const axios = require('axios');
+const adapter = require('axios/lib/adapters/http');
+const pkg = require('./../package.json');
+
+
+/**
+ * Instance
+ */
+
+const instance = axios.create();
+
+/* Default User-Agent */
+instance.defaults.headers.common['User-Agent'] = `node-${pkg.name}/${pkg.version}`;
+
+/* Default ACME settings */
+instance.defaults.acmeSettings = {
+    httpChallengePort: 80,
+    bypassCustomDnsResolver: false
+};
+
+
+/**
+ * Explicitly set Node as default HTTP adapter
+ *
+ * https://github.com/axios/axios/issues/1180
+ * https://stackoverflow.com/questions/42677387
+ */
+
+instance.defaults.adapter = adapter;
+
+
+/**
+ * Export instance
+ */
+
+module.exports = instance;