From e022b5f976ea6d89b42922ecdb22127328dabd24 Mon Sep 17 00:00:00 2001 From: iotux <46082385+iotux@users.noreply.github.com> Date: Thu, 15 Jan 2026 00:13:53 +0700 Subject: [PATCH] fix: allow for private domains like example.local and others (#6711) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Frank Elsinga --- server/model/domain_expiry.js | 13 +++--- src/lang/en.json | 3 +- test/backend-test/test-domain.js | 74 +++++++++----------------------- 3 files changed, 28 insertions(+), 62 deletions(-) diff --git a/server/model/domain_expiry.js b/server/model/domain_expiry.js index b7992575f..3502a4b08 100644 --- a/server/model/domain_expiry.js +++ b/server/model/domain_expiry.js @@ -159,20 +159,19 @@ class DomainExpiry extends BeanModel { const tld = parseTld(target); // Avoid logging for incomplete/invalid input while editing monitors. - if (!tld.domain) { - throw new TranslatableError("domain_expiry_unsupported_invalid_domain", { hostname: tld.hostname }); - } - if (!tld.publicSuffix) { - throw new TranslatableError("domain_expiry_unsupported_public_suffix", { publicSuffix: tld.publicSuffix }); - } if (tld.isIp) { throw new TranslatableError("domain_expiry_unsupported_is_ip", { hostname: tld.hostname }); } - // No one-letter public suffix exists; treat this as an incomplete/invalid input while typing. if (tld.publicSuffix.length < 2) { throw new TranslatableError("domain_expiry_public_suffix_too_short", { publicSuffix: tld.publicSuffix }); } + if (!tld.isIcann) { + throw new TranslatableError("domain_expiry_unsupported_is_icann", { + domain: tld.domain, + publicSuffix: tld.publicSuffix, + }); + } const rdap = await getRdapServer(tld.publicSuffix); if (!rdap) { diff --git a/src/lang/en.json b/src/lang/en.json index 19d259222..ea1ea35a8 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1297,9 +1297,8 @@ "domainExpiryDescription": "Trigger notification when domain names expires in:", "domain_expiry_unsupported_monitor_type": "Domain expiry monitoring is not supported for this monitor type", "domain_expiry_unsupported_missing_target": "No valid domain or hostname is configured for this monitor", - "domain_expiry_unsupported_invalid_domain": "The configured value \"{hostname}\" is not a valid domain name", "domain_expiry_public_suffix_too_short": "\".{publicSuffix}\" is too short for a top level domain", - "domain_expiry_unsupported_public_suffix": "The domain \"{domain}\" does not have a valid public suffix", + "domain_expiry_unsupported_is_icann": "The domain \"{domain}\" is not a candidate for domain expiry monitoring, because its public suffix \".{publicSuffix}\" is not ICAN", "domain_expiry_unsupported_is_ip": "\"{hostname}\" is an IP address. Domain expiry monitoring requires a domain name", "domain_expiry_unsupported_unsupported_tld_no_rdap_endpoint": "Domain expiry monitoring is not available for \".{publicSuffix}\" because no RDAP service is listed by IANA", "minimumIntervalWarning": "Intervals below 20 seconds may result in poor performance.", diff --git a/test/backend-test/test-domain.js b/test/backend-test/test-domain.js index e1c95cd5f..c00d94e24 100644 --- a/test/backend-test/test-domain.js +++ b/test/backend-test/test-domain.js @@ -96,58 +96,26 @@ describe("Domain Expiry", () => { }); describe("Domain Parsing", () => { - test("throws error for invalid domain (no domain part)", async () => { + test("throws error for IP address (isIp check)", async () => { const monitor = { type: "http", - url: "https://", + url: "https://127.0.0.1", domainExpiryNotification: true, }; await assert.rejects( async () => await DomainExpiry.checkSupport(monitor), (error) => { assert.strictEqual(error.constructor.name, "TranslatableError"); - assert.strictEqual(error.message, "domain_expiry_unsupported_invalid_domain"); + assert.strictEqual(error.message, "domain_expiry_unsupported_is_ip"); return true; } ); }); - test("throws error for IPv4 address instead of domain", async () => { + test("throws error for too short suffix(example.a)", async () => { const monitor = { type: "http", - url: "https://192.168.1.1", - domainExpiryNotification: true, - }; - await assert.rejects( - async () => await DomainExpiry.checkSupport(monitor), - (error) => { - assert.strictEqual(error.constructor.name, "TranslatableError"); - assert.strictEqual(error.message, "domain_expiry_unsupported_invalid_domain"); - return true; - } - ); - }); - - test("throws error for IPv6 address", async () => { - const monitor = { - type: "http", - url: "https://[2001:db8::1]", - domainExpiryNotification: true, - }; - await assert.rejects( - async () => await DomainExpiry.checkSupport(monitor), - (error) => { - assert.strictEqual(error.constructor.name, "TranslatableError"); - assert.strictEqual(error.message, "domain_expiry_unsupported_invalid_domain"); - return true; - } - ); - }); - - test("throws error for single-letter TLD", async () => { - const monitor = { - type: "http", - url: "https://example.x", + url: "https://example.a", domainExpiryNotification: true, }; await assert.rejects( @@ -159,6 +127,22 @@ describe("Domain Expiry", () => { } ); }); + + test("throws error for non-ICANN TLD (e.g. .local)", async () => { + const monitor = { + type: "http", + url: "https://example.local", + domainExpiryNotification: true, + }; + await assert.rejects( + async () => await DomainExpiry.checkSupport(monitor), + (error) => { + assert.strictEqual(error.constructor.name, "TranslatableError"); + assert.strictEqual(error.message, "domain_expiry_unsupported_is_icann"); + return true; + } + ); + }); }); describe("Edge Cases & RDAP Support", () => { @@ -205,22 +189,6 @@ describe("Domain Expiry", () => { assert.strictEqual(supportInfo.domain, "example.com"); assert.strictEqual(supportInfo.tld, "com"); }); - - test("throws error for unsupported TLD without RDAP endpoint", async () => { - const monitor = { - type: "http", - url: "https://example.localhost", - domainExpiryNotification: true, - }; - await assert.rejects( - async () => await DomainExpiry.checkSupport(monitor), - (error) => { - assert.strictEqual(error.constructor.name, "TranslatableError"); - assert.strictEqual(error.message, "domain_expiry_unsupported_unsupported_tld_no_rdap_endpoint"); - return true; - } - ); - }); }); });