roster-server 2.2.5 → 2.2.6

package/package.json

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

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

@@ -130,6 +130,51 @@ describe('acme-dns-01-cli-wrapper automatic Linode DNS', () => {
         assert.strictEqual(payload.name, '_acme-challenge.sub');
     });
 
+    it('prefers apex zone over www zone for www challenges', async () => {
+        const calls = [];
+        global.fetch = async (url, options = {}) => {
+            calls.push({ url, options });
+            if (url.endsWith('/domains?page_size=500')) {
+                return {
+                    ok: true,
+                    status: 200,
+                    json: async () => ({
+                        data: [
+                            { id: 777, domain: 'www.tagnu.com' },
+                            { id: 888, domain: 'tagnu.com' }
+                        ]
+                    })
+                };
+            }
+            if (url.endsWith('/domains/888/records?page_size=500')) {
+                return { ok: true, status: 200, json: async () => ({ data: [] }) };
+            }
+            if (url.endsWith('/domains/888/records') && options.method === 'POST') {
+                return { ok: true, status: 200, json: async () => ({ id: 333 }) };
+            }
+            return { ok: true, status: 204, json: async () => ({}) };
+        };
+
+        const challenger = wrapper.create({
+            provider: 'linode',
+            linodeApiKey: 'fake-token',
+            verifyDnsBeforeContinue: false,
+            propagationDelay: 0,
+            dryRunDelay: 0
+        });
+
+        await challenger.set({
+            challenge: {
+                altname: 'www.tagnu.com',
+                dnsHost: '_greenlock-dryrun-abc.www.tagnu.com',
+                dnsAuthorization: 'www-token'
+            }
+        });
+
+        assert.ok(calls.some((c) => c.url.endsWith('/domains/888/records') && c.options.method === 'POST'));
+        assert.ok(!calls.some((c) => c.url.endsWith('/domains/777/records') && c.options.method === 'POST'));
+    });
+
     it('falls back to manual when provider mode has no API key (default)', async () => {
         const prevLinode = process.env.LINODE_API_KEY;
         delete process.env.LINODE_API_KEY;

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

@@ -212,6 +212,14 @@ module.exports.create = function create(config = {}) {
             }
         };
 
+        // Prefer apex zone when validating www.<domain> challenges so records are
+        // created in the commonly delegated parent zone (e.g. tagnu.com).
+        if (altname) {
+            const normalizedAltname = String(altname).replace(/^\*\./, '').replace(/\.$/, '').toLowerCase();
+            if (normalizedAltname.startsWith('www.')) {
+                add(normalizedAltname.slice(4));
+            }
+        }
         if (dnsHost) {
             const normalizedDnsHost = String(dnsHost).replace(/^_acme-challenge\./, '').replace(/^_greenlock-[^.]+\./, '');
             add(normalizedDnsHost);