From b6bb69f110ec76ddedf7ab07eecfa06c5f8b620e Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 11:56:05 +0800 Subject: [PATCH 01/12] require strict parents for every level + fix ns on nested subdomains with ns --- tests/domains.test.js | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/domains.test.js b/tests/domains.test.js index 9df9598f4..fc7a94696 100644 --- a/tests/domains.test.js +++ b/tests/domains.test.js @@ -24,26 +24,32 @@ function getDomainData(subdomain) { t("Nested subdomains should not exist without a parent subdomain", (t) => { files.forEach((file) => { const subdomain = file.replace(/\.json$/, ""); - const parentDomain = subdomain.split(".").reverse()[0]; + const parts = subdomain.split("."); - if (parentDomain !== subdomain) { + for (let i = 1; i < parts.length; i++) { + const parent = parts.slice(i).join("."); t.true( - parentDomain && files.includes(`${parentDomain}.json`), - `${file}: Parent subdomain does not exist` + files.includes(`${parent}.json`), + `${file}: Parent subdomain "${parent}" does not exist` ); } }); }); -t("Nested subdomains should not exist if the parent subdomain has NS records", (t) => { +t("Nested subdomains should not exist if any parent subdomain has NS records", (t) => { files.forEach((file) => { const subdomain = file.replace(/\.json$/, ""); - const parentDomain = subdomain.split(".").reverse()[0]; + const parts = subdomain.split("."); - if (parentDomain !== subdomain) { - const parentData = getDomainData(parentDomain); + for (let i = 1; i < parts.length; i++) { + const parent = parts.slice(i).join("."); + const parentData = getDomainData(parent); - t.true(!parentData.record.NS, `${file}: Parent subdomain has NS records`); + if (!parentData) continue; + if (parentData.record.NS) { + t.fail(`${file}: Parent subdomain "${parent}" has NS records`); + return; + } } }); }); From 49d0406b2c821ef8dff768f1dd5faab1876641d2 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:00:36 +0800 Subject: [PATCH 02/12] allow SRV style domains --- tests/domains.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/domains.test.js b/tests/domains.test.js index fc7a94696..42bfb77ad 100644 --- a/tests/domains.test.js +++ b/tests/domains.test.js @@ -61,6 +61,9 @@ t("Nested subdomains should be owned by the parent subdomain's owner", (t) => { if (parentDomain !== subdomain) { const data = getDomainData(subdomain); + + if (parent.startsWith("_")) continue; + const parentData = getDomainData(parentDomain); t.true( From 60eeacbc2f24b63c975453ae81a623c93179e491 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:02:40 +0800 Subject: [PATCH 03/12] Update domains.test.js --- tests/domains.test.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/domains.test.js b/tests/domains.test.js index 42bfb77ad..159c1fd85 100644 --- a/tests/domains.test.js +++ b/tests/domains.test.js @@ -43,9 +43,10 @@ t("Nested subdomains should not exist if any parent subdomain has NS records", ( for (let i = 1; i < parts.length; i++) { const parent = parts.slice(i).join("."); + if (parent.startsWith("_")) continue; + const parentData = getDomainData(parent); - if (!parentData) continue; if (parentData.record.NS) { t.fail(`${file}: Parent subdomain "${parent}" has NS records`); return; @@ -61,9 +62,6 @@ t("Nested subdomains should be owned by the parent subdomain's owner", (t) => { if (parentDomain !== subdomain) { const data = getDomainData(subdomain); - - if (parent.startsWith("_")) continue; - const parentData = getDomainData(parentDomain); t.true( From 20d22f09fbb835d7441569bb61535b40b4666b90 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:04:34 +0800 Subject: [PATCH 04/12] Update domains.test.js --- tests/domains.test.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/domains.test.js b/tests/domains.test.js index 159c1fd85..12ee7089c 100644 --- a/tests/domains.test.js +++ b/tests/domains.test.js @@ -28,6 +28,8 @@ t("Nested subdomains should not exist without a parent subdomain", (t) => { for (let i = 1; i < parts.length; i++) { const parent = parts.slice(i).join("."); + if (parent.startsWith("_")) continue; + t.true( files.includes(`${parent}.json`), `${file}: Parent subdomain "${parent}" does not exist` @@ -43,8 +45,7 @@ t("Nested subdomains should not exist if any parent subdomain has NS records", ( for (let i = 1; i < parts.length; i++) { const parent = parts.slice(i).join("."); - if (parent.startsWith("_")) continue; - + if (parent.startsWith("_") || !files.includes(`${parent}.json`)) continue; const parentData = getDomainData(parent); if (parentData.record.NS) { From 583d1e8c73e6e85d5b07b30dd6049a610a56efb5 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:06:58 +0800 Subject: [PATCH 05/12] Create mc.3gee.json --- domains/mc.3gee.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 domains/mc.3gee.json diff --git a/domains/mc.3gee.json b/domains/mc.3gee.json new file mode 100644 index 000000000..754a634a0 --- /dev/null +++ b/domains/mc.3gee.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "3geETR", + "email": "egemacun@gmail.com" + }, + "record": { + "CNAME": "gold.magmanode.com" + } +} From cd83650a5fb38f6212ab2f76dde4baf5a9ec04c4 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:07:36 +0800 Subject: [PATCH 06/12] Update _minecraft._tcp.mc.3gee.json --- domains/_minecraft._tcp.mc.3gee.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domains/_minecraft._tcp.mc.3gee.json b/domains/_minecraft._tcp.mc.3gee.json index ca7a9f426..b717967fb 100644 --- a/domains/_minecraft._tcp.mc.3gee.json +++ b/domains/_minecraft._tcp.mc.3gee.json @@ -9,7 +9,7 @@ "priority": 0, "weight": 5, "port": 32279, - "target": "gold.magmanode.com" + "target": "mc.3gee.is-a.dev" } ] } From fa41de81376fa0cf4f7f6230f4904d8ad51d671a Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:09:36 +0800 Subject: [PATCH 07/12] Delete domains/api.karyakarsa.willo.json --- domains/api.karyakarsa.willo.json | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 domains/api.karyakarsa.willo.json diff --git a/domains/api.karyakarsa.willo.json b/domains/api.karyakarsa.willo.json deleted file mode 100644 index c70b3e330..000000000 --- a/domains/api.karyakarsa.willo.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "description": "api for karyakarsa", - "repo": "https://github.com/WilloIzCitron/karyakarsa-rest-api", - "owner": { - "username": "WilloIzCitron", - "twitter": "willoizcitron" - }, - "record": { - "CNAME": "karyakarsa-rest-api-production.up.railway.app" - } -} From eef698641f842bc343938da9f8af42116ab563c9 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:11:44 +0800 Subject: [PATCH 08/12] Delete domains/resend._domainkey.auth.sign.alvin.json --- domains/resend._domainkey.auth.sign.alvin.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 domains/resend._domainkey.auth.sign.alvin.json diff --git a/domains/resend._domainkey.auth.sign.alvin.json b/domains/resend._domainkey.auth.sign.alvin.json deleted file mode 100644 index 37fb5d358..000000000 --- a/domains/resend._domainkey.auth.sign.alvin.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "alvinsjoy", - "discord": "825382504353234954" - }, - "record": { - "TXT": "p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJKRhjsqeFCeiJu7RCgTQLle1cBelrRmpLQJoJIc1JHTBSc0RNuLTwMEWzE3Kb/ichQ+9JiOnSAEYXM/HYmdPdBL0e1xj5WJum/kKidmyaSJunNVUmpy85BgbIex3icbnZcTaUOXzTTPdxnJJZy5iJWGt39/hYkHKdOuYtNDeKJwIDAQAB" - } -} From 0ae2ed386ed28931bdc9e3a5d16720579405dcc6 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:13:54 +0800 Subject: [PATCH 09/12] Discard changes to domains/resend._domainkey.auth.sign.alvin.json --- domains/resend._domainkey.auth.sign.alvin.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 domains/resend._domainkey.auth.sign.alvin.json diff --git a/domains/resend._domainkey.auth.sign.alvin.json b/domains/resend._domainkey.auth.sign.alvin.json new file mode 100644 index 000000000..37fb5d358 --- /dev/null +++ b/domains/resend._domainkey.auth.sign.alvin.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "alvinsjoy", + "discord": "825382504353234954" + }, + "record": { + "TXT": "p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJKRhjsqeFCeiJu7RCgTQLle1cBelrRmpLQJoJIc1JHTBSc0RNuLTwMEWzE3Kb/ichQ+9JiOnSAEYXM/HYmdPdBL0e1xj5WJum/kKidmyaSJunNVUmpy85BgbIex3icbnZcTaUOXzTTPdxnJJZy5iJWGt39/hYkHKdOuYtNDeKJwIDAQAB" + } +} From 2525de5cfe089033ab9666bc8ea6d59378365d39 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:14:52 +0800 Subject: [PATCH 10/12] Create auth.sign.alvin.json --- domains/auth.sign.alvin.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 domains/auth.sign.alvin.json diff --git a/domains/auth.sign.alvin.json b/domains/auth.sign.alvin.json new file mode 100644 index 000000000..c279d0ff2 --- /dev/null +++ b/domains/auth.sign.alvin.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "alvinsjoy", + "discord": "825382504353234954" + }, + "record": { + "TXT": "Created to allow nested subdomains to exist." + } +} From 710a476a52ccaabc9b9f2e22bf112ea7dd0ed238 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:21:03 +0800 Subject: [PATCH 11/12] Update domains.test.js --- tests/domains.test.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/domains.test.js b/tests/domains.test.js index 12ee7089c..d5a4b6148 100644 --- a/tests/domains.test.js +++ b/tests/domains.test.js @@ -48,10 +48,7 @@ t("Nested subdomains should not exist if any parent subdomain has NS records", ( if (parent.startsWith("_") || !files.includes(`${parent}.json`)) continue; const parentData = getDomainData(parent); - if (parentData.record.NS) { - t.fail(`${file}: Parent subdomain "${parent}" has NS records`); - return; - } + t.false(parentData.record.NS, `${file}: Parent subdomain "${parent}" has NS records`); } }); }); From 2d62b0210c4e52fe856b59cf5623f24ede7722ce Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:24:18 +0800 Subject: [PATCH 12/12] fix --- tests/domains.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/domains.test.js b/tests/domains.test.js index d5a4b6148..43395fcda 100644 --- a/tests/domains.test.js +++ b/tests/domains.test.js @@ -48,7 +48,7 @@ t("Nested subdomains should not exist if any parent subdomain has NS records", ( if (parent.startsWith("_") || !files.includes(`${parent}.json`)) continue; const parentData = getDomainData(parent); - t.false(parentData.record.NS, `${file}: Parent subdomain "${parent}" has NS records`); + t.true(!parentData.record.NS, `${file}: Parent subdomain "${parent}" has NS records`); } }); });