fix(services): разрешить несколько доп. FQDN на IP включая wildcard
quality / commitlint (push) Skipped
CD / update-wiki (push) Successful in 6s
quality / changes (push) Successful in 10s
quality / docker-check (push) Skipped
quality / web (push) Successful in 1m16s
quality / api (push) Successful in 1m14s
CD / quality (push) Successful in 2m44s
CD / publish (push) Successful in 1m50s
quality / commitlint (push) Skipped
CD / update-wiki (push) Successful in 6s
quality / changes (push) Successful in 10s
quality / docker-check (push) Skipped
quality / web (push) Successful in 1m16s
quality / api (push) Successful in 1m14s
CD / quality (push) Successful in 2m44s
CD / publish (push) Successful in 1m50s
У IP был один extra FQDN; wildcard вида *.mdns.shnt.top не матчился с именем из Cloudflare. Co-authored-by: Cursor <[email protected]>
This commit is contained in:
@@ -19,6 +19,7 @@ export function dnsNameToSubdomainLabel(
|
||||
return prefix || "@";
|
||||
}
|
||||
|
||||
if (rn.startsWith("*.")) return rn;
|
||||
if (!rn.includes(".")) return rn;
|
||||
|
||||
return null;
|
||||
|
||||
@@ -23,6 +23,13 @@ describe("normalizeDnsRecordName", () => {
|
||||
expect(normalizeDnsRecordName("@", ZONE)).toBe("rkns.top");
|
||||
expect(normalizeDnsRecordName("rkns.top", ZONE)).toBe("rkns.top");
|
||||
});
|
||||
|
||||
it("normalizes nested wildcard relative name to FQDN", () => {
|
||||
expect(normalizeDnsRecordName("*.mdns", ZONE)).toBe("*.mdns.rkns.top");
|
||||
expect(normalizeDnsRecordName("*.mdns.rkns.top", ZONE)).toBe(
|
||||
"*.mdns.rkns.top",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("dnsRecordNamesMatch", () => {
|
||||
@@ -34,10 +41,19 @@ describe("dnsRecordNamesMatch", () => {
|
||||
it("does not match different hosts", () => {
|
||||
expect(dnsRecordNamesMatch("de", "mhome.rkns.top", ZONE)).toBe(false);
|
||||
});
|
||||
|
||||
it("matches nested wildcard relative name and FQDN", () => {
|
||||
expect(dnsRecordNamesMatch("*.mdns", "*.mdns.rkns.top", ZONE)).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe("dnsNameToSubdomainLabel", () => {
|
||||
it("extracts label from FQDN", () => {
|
||||
expect(dnsNameToSubdomainLabel("de.rkns.top", ZONE)).toBe("de");
|
||||
});
|
||||
|
||||
it("keeps nested wildcard relative names", () => {
|
||||
expect(dnsNameToSubdomainLabel("*.mdns", ZONE)).toBe("*.mdns");
|
||||
expect(dnsNameToSubdomainLabel("*.mdns.rkns.top", ZONE)).toBe("*.mdns");
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user