From 3a2c8c894ee9019d25a3b2ab9acfe6411afcf301 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:13:03 +0800 Subject: [PATCH 1/8] reserve `sso` --- util/reserved.json | 1 + 1 file changed, 1 insertion(+) diff --git a/util/reserved.json b/util/reserved.json index 66153768a..a7ac38faf 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -116,6 +116,7 @@ "service", "services", "shop", + "sso", "staff", "staging", "static", From ca5a243cfe861942039cb12dd681ce3b5f0d8069 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:19:07 +0800 Subject: [PATCH 2/8] Delete domains/rdap.json --- domains/rdap.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 domains/rdap.json diff --git a/domains/rdap.json b/domains/rdap.json deleted file mode 100644 index f2b45dc76..000000000 --- a/domains/rdap.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "rdaphq", - "email": "rdapshii@gmail.com" - }, - "record": { - "A": ["156.67.73.46"] - } -} From 9f48361a7668944e5da53270a53b3f532bcde239 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:20:17 +0800 Subject: [PATCH 3/8] reserve `rdap` --- util/reserved.json | 1 + 1 file changed, 1 insertion(+) diff --git a/util/reserved.json b/util/reserved.json index a7ac38faf..e223c1b44 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -110,6 +110,7 @@ "registrar", "registry", "reserved", + "rdap", "root", "secure", "security", From 82ae2d7722838ac3afb5200a5f67f15c6fe6e472 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:22:52 +0800 Subject: [PATCH 4/8] Delete domains/polls.json --- domains/polls.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 domains/polls.json diff --git a/domains/polls.json b/domains/polls.json deleted file mode 100644 index be315fac0..000000000 --- a/domains/polls.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "Yunexiz", - "discord": "1040303561847881729" - }, - "record": { - "URL": "https://y.is-a.dev" - } -} From 663c7fd3f0cb11db6fb216df02a152dbfd3f94a3 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:24:07 +0800 Subject: [PATCH 5/8] reserve `event`, `events`, `poll`, `polls` --- util/reserved.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/reserved.json b/util/reserved.json index e223c1b44..ef040efb4 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -37,6 +37,8 @@ "documentation", "domain", "email", + "event", + "events", "example", "feedback", "file", @@ -98,6 +100,8 @@ "pay", "payment", "payments", + "poll", + "polls", "portal", "postmaster", "preview", From 90a28b28f014ed64b4cc66c68f5be8a368bc56f8 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:25:25 +0800 Subject: [PATCH 6/8] alphabetise reserved.json --- util/reserved.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/reserved.json b/util/reserved.json index ef040efb4..280087d96 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -3,7 +3,9 @@ "about", "account", "accounts", + "ad", "admin", + "ads", "api", "apis", "app", @@ -15,8 +17,6 @@ "authorise", "authorization", "authorize", - "ad", - "ads", "billing", "blog", "board", @@ -109,12 +109,12 @@ "prod", "production", "r", + "rdap", "redirect", "register", "registrar", "registry", "reserved", - "rdap", "root", "secure", "security", From 64c055007d4155bb03743206501da05d764142d6 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:38:02 +0800 Subject: [PATCH 7/8] `excepted.json` -> `excluded.json` --- tests/json.test.js | 4 ++-- util/{excepted.json => excluded.json} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename util/{excepted.json => excluded.json} (100%) diff --git a/tests/json.test.js b/tests/json.test.js index 4da5b896f..123902a73 100644 --- a/tests/json.test.js +++ b/tests/json.test.js @@ -30,7 +30,7 @@ const optionalRedirectConfigFields = { const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/; const hostnameRegex = /^(?=.{1,253}$)(?:(?:[_a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)\.)+[a-zA-Z]{2,63}$/; -const exceptedDomains = require("../util/excepted.json"); +const excludedDomains = require("../util/excluded.json"); const reservedDomains = require("../util/reserved.json"); const domainsPath = path.resolve("domains"); const files = fs.readdirSync(domainsPath); @@ -113,7 +113,7 @@ async function validateFileName(t, file) { const rootSubdomain = subdomain.split(".").pop(); - if (!exceptedDomains.includes(rootSubdomain)) { + if (!excludedDomains.includes(rootSubdomain)) { t.false(rootSubdomain.startsWith("_"), `${file}: Root subdomains should not start with an underscore`); } } diff --git a/util/excepted.json b/util/excluded.json similarity index 100% rename from util/excepted.json rename to util/excluded.json From 3dfdba562760a986aead4317c9fe80e039125c24 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:38:11 +0800 Subject: [PATCH 8/8] reserve `asset` --- util/reserved.json | 1 + 1 file changed, 1 insertion(+) diff --git a/util/reserved.json b/util/reserved.json index 280087d96..9b81d53fa 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -10,6 +10,7 @@ "apis", "app", "apps", + "asset", "assets", "auth", "authentication",