@certd/acme-client 1.34.0 → 1.34.2

package/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.34.0",
+    "version": "1.34.2",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.34.0",
+        "@certd/basic": "^1.34.2",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -51,7 +51,8 @@
         "lint": "eslint .",
         "lint-types": "tsd",
         "prepublishOnly": "npm run build-docs",
-        "test": "mocha -t 60000 \"test/setup.js\" \"test/**/*.spec.js\""
+        "test": "mocha -t 60000 \"test/setup.js\" \"test/**/*.spec.js\"",
+        "pub": "npm publish"
     },
     "repository": {
         "type": "git",
@@ -68,5 +69,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
+    "gitHead": "a1e504c1387e9b0554c8d030cb53c5058e7d683a"
 }

package/src/auto.js

@@ -234,6 +234,7 @@ export default async (client, userOpts) => {
             throw new CancelError("用户取消");
         }
 
+        const waitDnsDiffuseTime = opts.waitDnsDiffuseTime || 30;
         try {
             // eslint-disable-next-line no-await-in-loop
             await runPromisePa(challengePromises);
@@ -242,8 +243,8 @@ export default async (client, userOpts) => {
                 await wait(60 * 1000);
             } else {
                 await runPromisePa(localVerifyTasks, 1000);
-                log("本地校验完成，等待30s")
-                await wait(30 * 1000)
+                log(`本地校验完成，等待${waitDnsDiffuseTime}s`)
+                await wait(waitDnsDiffuseTime * 1000)
             }
 
             log("开始向提供商请求挑战验证");

package/src/verify.js

@@ -24,22 +24,46 @@ const dns = dnsSdk.promises
  */
 
 async function verifyHttpChallenge(authz, challenge, keyAuthorization, suffix = `/.well-known/acme-challenge/${challenge.token}`) {
-    const httpPort = axios.defaults.acmeSettings.httpChallengePort || 80;
-    const challengeUrl = `http://${authz.identifier.value}:${httpPort}${suffix}`;
 
-    /* May redirect to HTTPS with invalid/self-signed cert - https://letsencrypt.org/docs/challenge-types/#http-01-challenge */
-    const httpsAgent = new https.Agent({ rejectUnauthorized: false });
+    async function doQuery(challengeUrl){
+        log(`正在测试请求 ${challengeUrl} `)
+        // const httpsPort = axios.defaults.acmeSettings.httpsChallengePort || 443;
+        // const challengeUrl = `https://${authz.identifier.value}:${httpsPort}${suffix}`;
+
+        /* May redirect to HTTPS with invalid/self-signed cert - https://letsencrypt.org/docs/challenge-types/#http-01-challenge */
+        const httpsAgent = new https.Agent({ rejectUnauthorized: false });
+
+        log(`Sending HTTP query to ${authz.identifier.value}, suffix: ${suffix}, port: ${httpPort}`);
+        let data = ""
+        try{
+            const resp = await axios.get(challengeUrl, { httpsAgent });
+            data = (resp.data || '').replace(/\s+$/, '');
+        }catch (e) {
+            log(`[error] HTTP request error from ${authz.identifier.value}`,e.message);
+            return false
+        }
+
+        if (!data || (data !== keyAuthorization)) {
+            log(`[error] Authorization not found in HTTP response from ${authz.identifier.value}`);
+            return false
+        }
+        return true
 
-    log(`Sending HTTP query to ${authz.identifier.value}, suffix: ${suffix}, port: ${httpPort}`);
-    const resp = await axios.get(challengeUrl, { httpsAgent });
-    const data = (resp.data || '').replace(/\s+$/, '');
+    }
 
-    log(`Query successful, HTTP status code: ${resp.status}`);
+    const httpPort = axios.defaults.acmeSettings.httpChallengePort || 80;
+    const challengeUrl = `http://${authz.identifier.value}:${httpPort}${suffix}`;
 
-    if (!data || (data !== keyAuthorization)) {
-        throw new Error(`Authorization not found in HTTP response from ${authz.identifier.value}`);
+    if (!await doQuery(challengeUrl)) {
+        const httpsPort = axios.defaults.acmeSettings.httpsChallengePort || 443;
+        const httpsChallengeUrl = `https://${authz.identifier.value}:${httpsPort}${suffix}`;
+        const res = await doQuery(httpsChallengeUrl)
+        if (!res) {
+            throw new Error(`[error] 验证失败，请检查以上测试url是否可以正常访问`);
+        }
     }
 
+
     log(`Key authorization match for ${challenge.type}/${authz.identifier.value}, ACME challenge verified`);
     return true;
 }

package/types/dist/index.test-d.js

@@ -1,58 +0,0 @@
-/**
- * acme-client type definition tests
- */
-import * as acme from 'acme-client';
-(async () => {
-    /* Client */
-    const accountKey = await acme.crypto.createPrivateKey();
-    const client = new acme.Client({
-        accountKey,
-        directoryUrl: acme.directory.letsencrypt.staging
-    });
-    /* Account */
-    await client.createAccount({
-        termsOfServiceAgreed: true,
-        contact: ['mailto:test@example.com']
-    });
-    /* Order */
-    const order = await client.createOrder({
-        identifiers: [
-            { type: 'dns', value: 'example.com' },
-            { type: 'dns', value: '*.example.com' },
-        ]
-    });
-    await client.getOrder(order);
-    /* Authorizations / Challenges */
-    const authorizations = await client.getAuthorizations(order);
-    const authorization = authorizations[0];
-    const challenge = authorization.challenges[0];
-    await client.getChallengeKeyAuthorization(challenge);
-    await client.verifyChallenge(authorization, challenge);
-    await client.completeChallenge(challenge);
-    await client.waitForValidStatus(challenge);
-    /* Finalize */
-    const [certKey, certCsr] = await acme.crypto.createCsr({
-        commonName: 'example.com',
-        altNames: ['example.com', '*.example.com']
-    });
-    await client.finalizeOrder(order, certCsr);
-    await client.getCertificate(order);
-    await client.getCertificate(order, 'DST Root CA X3');
-    /* Auto */
-    await client.auto({
-        csr: certCsr,
-        challengeCreateFn: async (authz, challenge, keyAuthorization) => { },
-        challengeRemoveFn: async (authz, challenge, keyAuthorization) => { }
-    });
-    await client.auto({
-        csr: certCsr,
-        email: 'test@example.com',
-        termsOfServiceAgreed: false,
-        skipChallengeVerification: false,
-        challengePriority: ['http-01', 'dns-01'],
-        preferredChain: 'DST Root CA X3',
-        challengeCreateFn: async (authz, challenge, keyAuthorization) => { },
-        challengeRemoveFn: async (authz, challenge, keyAuthorization) => { }
-    });
-})();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXgudGVzdC1kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vaW5kZXgudGVzdC1kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBRUgsT0FBTyxLQUFLLElBQUksTUFBTSxhQUFhLENBQUM7QUFFcEMsQ0FBQyxLQUFLLElBQUksRUFBRTtJQUNSLFlBQVk7SUFDWixNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUV4RCxNQUFNLE1BQU0sR0FBRyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDM0IsVUFBVTtRQUNWLFlBQVksRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxPQUFPO0tBQ25ELENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUM7UUFDdkIsb0JBQW9CLEVBQUUsSUFBSTtRQUMxQixPQUFPLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQztLQUN2QyxDQUFDLENBQUM7SUFFSCxXQUFXO0lBQ1gsTUFBTSxLQUFLLEdBQUcsTUFBTSxNQUFNLENBQUMsV0FBVyxDQUFDO1FBQ25DLFdBQVcsRUFBRTtZQUNULEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsYUFBYSxFQUFFO1lBQ3JDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsZUFBZSxFQUFFO1NBQzFDO0tBQ0osQ0FBQyxDQUFDO0lBRUgsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRTdCLGlDQUFpQztJQUNqQyxNQUFNLGNBQWMsR0FBRyxNQUFNLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3RCxNQUFNLGFBQWEsR0FBRyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDeEMsTUFBTSxTQUFTLEdBQUcsYUFBYSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUU5QyxNQUFNLE1BQU0sQ0FBQyw0QkFBNEIsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNyRCxNQUFNLE1BQU0sQ0FBQyxlQUFlLENBQUMsYUFBYSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZELE1BQU0sTUFBTSxDQUFDLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzFDLE1BQU0sTUFBTSxDQUFDLGtCQUFrQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBRTNDLGNBQWM7SUFDZCxNQUFNLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7UUFDbkQsVUFBVSxFQUFFLGFBQWE7UUFDekIsUUFBUSxFQUFFLENBQUMsYUFBYSxFQUFFLGVBQWUsQ0FBQztLQUM3QyxDQUFDLENBQUM7SUFFSCxNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzNDLE1BQU0sTUFBTSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNuQyxNQUFNLE1BQU0sQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLGdCQUFnQixDQUFDLENBQUM7SUFFckQsVUFBVTtJQUNWLE1BQU0sTUFBTSxDQUFDLElBQUksQ0FBQztRQUNkLEdBQUcsRUFBRSxPQUFPO1FBQ1osaUJBQWlCLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsRUFBRSxHQUFFLENBQUM7UUFDbkUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsRUFBRSxHQUFFLENBQUM7S0FDdEUsQ0FBQyxDQUFDO0lBRUgsTUFBTSxNQUFNLENBQUMsSUFBSSxDQUFDO1FBQ2QsR0FBRyxFQUFFLE9BQU87UUFDWixLQUFLLEVBQUUsa0JBQWtCO1FBQ3pCLG9CQUFvQixFQUFFLEtBQUs7UUFDM0IseUJBQXlCLEVBQUUsS0FBSztRQUNoQyxpQkFBaUIsRUFBRSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUM7UUFDeEMsY0FBYyxFQUFFLGdCQUFnQjtRQUNoQyxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxFQUFFLEdBQUUsQ0FBQztRQUNuRSxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxFQUFFLEdBQUUsQ0FBQztLQUN0RSxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsRUFBRSxDQUFDIn0=