roster-server 2.1.22 → 2.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "roster-server",
-    "version": "2.1.22",
+    "version": "2.1.24",
     "description": "👾 RosterServer - A domain host router to host multiple HTTPS.",
     "main": "index.js",
     "scripts": {

package/vendor/acme-dns-01-cli-wrapper.js

@@ -2,6 +2,7 @@
 
 const legacyCli = require('acme-dns-01-cli');
 const log = require('lemonlog')('acme-dns-01');
+const dns = require('node:dns').promises;
 
 function toPromise(fn, context) {
     if (typeof fn !== 'function') {
@@ -60,20 +61,70 @@ module.exports.create = function create(config = {}) {
         : Number.isFinite(Number(process.env.ROSTER_DNS_DRYRUN_DELAY_MS))
             ? Number(process.env.ROSTER_DNS_DRYRUN_DELAY_MS)
             : propagationDelay;
+    const parseBool = (value, fallback) => {
+        if (value === undefined || value === null || value === '') return fallback;
+        const normalized = String(value).trim().toLowerCase();
+        if (['1', 'true', 'yes', 'on'].includes(normalized)) return true;
+        if (['0', 'false', 'no', 'off'].includes(normalized)) return false;
+        return fallback;
+    };
+    const verifyDnsBeforeContinue = config.verifyDnsBeforeContinue !== undefined
+        ? parseBool(config.verifyDnsBeforeContinue, true)
+        : parseBool(process.env.ROSTER_DNS_VERIFY_BEFORE_CONTINUE, true);
+    const dnsPollIntervalMs = Number.isFinite(config.dnsPollIntervalMs)
+        ? config.dnsPollIntervalMs
+        : Number.isFinite(Number(process.env.ROSTER_DNS_POLL_INTERVAL_MS))
+            ? Number(process.env.ROSTER_DNS_POLL_INTERVAL_MS)
+            : 5000;
+    const dnsPollTimeoutMs = Number.isFinite(config.dnsPollTimeoutMs)
+        ? config.dnsPollTimeoutMs
+        : Number.isFinite(Number(process.env.ROSTER_DNS_POLL_TIMEOUT_MS))
+            ? Number(process.env.ROSTER_DNS_POLL_TIMEOUT_MS)
+            : null;
 
     function sleep(ms) {
         return new Promise((resolve) => setTimeout(resolve, ms));
     }
 
+    function normalizeTxtChunk(value) {
+        return String(value || '').replace(/^"+|"+$/g, '');
+    }
+
+    function resolveExpectedToken(opts, ch) {
+        const candidate = ch?.dnsAuthorization || opts?.dnsAuthorization;
+        return candidate ? String(candidate).trim() : '';
+    }
+
+    async function hasDnsTxtToken(dnsHost, expectedToken) {
+        if (!dnsHost || !expectedToken) return false;
+        try {
+            const records = await dns.resolveTxt(dnsHost);
+            for (const recordParts of records || []) {
+                const joined = (recordParts || []).map(normalizeTxtChunk).join('').trim();
+                if (joined === expectedToken) return true;
+            }
+            return false;
+        } catch (_) {
+            return false;
+        }
+    }
+
+    async function waitForDnsTxtPropagation(dnsHost, expectedToken, timeoutMs) {
+        const started = Date.now();
+        const maxWait = Math.max(0, Number.isFinite(timeoutMs) ? timeoutMs : 0);
+        if (maxWait === 0) return hasDnsTxtToken(dnsHost, expectedToken);
+
+        while ((Date.now() - started) <= maxWait) {
+            if (await hasDnsTxtToken(dnsHost, expectedToken)) return true;
+            await sleep(Math.max(1000, dnsPollIntervalMs));
+        }
+        return false;
+    }
+
     const presentedByHost = new Map();
     const presentedByAltname = new Map();
 
     async function setChallenge(opts) {
-        const isInteractive = Boolean(process.stdin && process.stdin.isTTY);
-        if (isInteractive && !autoContinue) {
-            return toPromise(challenger.set, challenger)(opts);
-        }
-
         const ch = opts?.challenge || {};
         log.info('');
         log.info("[ACME dns-01 '" + (ch.altname || opts?.altname || 'unknown') + "' CHALLENGE]");
@@ -92,6 +143,8 @@ module.exports.create = function create(config = {}) {
         const effectiveDelay = isDryRunChallenge
             ? Math.max(0, dryRunDelay)
             : propagationDelay;
+        const effectiveTimeoutMs = dnsPollTimeoutMs === null ? effectiveDelay : dnsPollTimeoutMs;
+        const expectedToken = resolveExpectedToken(opts, ch);
 
         log.info(
             '\tTXT\t' +
@@ -101,6 +154,28 @@ module.exports.create = function create(config = {}) {
                 '\tTTL 60'
         );
         log.info('');
+        if (verifyDnsBeforeContinue && dnsHost && expectedToken) {
+            log.info(
+                'DNS verification enabled. Continuing automatically when TXT appears at ' +
+                dnsHost +
+                ' (timeout ' +
+                effectiveTimeoutMs +
+                'ms, poll ' +
+                dnsPollIntervalMs +
+                'ms).'
+            );
+            const propagated = await waitForDnsTxtPropagation(dnsHost, expectedToken, effectiveTimeoutMs);
+            if (propagated) {
+                log.info(`DNS TXT detected for ${dnsHost}; continuing ACME flow.`);
+                return null;
+            }
+            log.warn(
+                `DNS TXT not detected for ${dnsHost} within ${effectiveTimeoutMs}ms; ` +
+                'continuing anyway (ACME preflight may still fail).'
+            );
+            return null;
+        }
+
         log.info(
             'Non-interactive mode (or autoContinue) detected. ' +
             'Set the TXT record now. Continuing automatically in ' +