From bc55135cef1c36c28d83b2130564ebf6cc5f6489 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 13 Feb 2025 18:01:15 +0800 Subject: [PATCH] prettier + updates to tests --- .github/ISSUE_TEMPLATE/bug.md | 3 +- .github/ISSUE_TEMPLATE/questions.md | 3 +- .github/ISSUE_TEMPLATE/report-abuse.md | 3 +- .github/ISSUE_TEMPLATE/suggestions.md | 3 +- .github/ISSUE_TEMPLATE/support.md | 3 +- .github/PULL_REQUEST_TEMPLATE.md | 1 + .github/labeler.yml | 6 +- .github/workflows/label.yml | 20 +- domains/_gh-is-a-dev-docs-o.docs.json | 9 - domains/_gh-is-a-dev-docs-o.json | 9 - ...ub-pages-challenge-is-a-dev-docs.docs.json | 9 - domains/_minecraft._tcp.mc.3gee.json | 2 - domains/amiyo.json | 1 - domains/devmatei.json | 1 - domains/generic2.json | 1 - domains/genericx.json | 1 - domains/generix.json | 1 - domains/gua.json | 1 - domains/hongson.json | 1 - domains/jbmbhs.json | 1 - domains/julianwe17.json | 1 - domains/kleein.json | 1 - domains/mail.mrstickypiston.json | 1 - domains/mrcat.json | 1 - domains/navistar.json | 1 - domains/navistar2.json | 1 - domains/nicollas.json | 1 - domains/nietbeer.json | 1 - domains/nifle.json | 1 - domains/nyexoi.json | 1 - domains/redolent.json | 1 - domains/region.json | 1 - domains/s97.json | 1 - domains/safety.json | 1 - domains/sq.json | 1 - domains/tofu.json | 1 - domains/usekyber.json | 1 - domains/wave.json | 1 - domains/xgeneric.json | 1 - domains/zalex.json | 1 - domains/zmail._domainkey.aruria.json | 1 - .../zmail._domainkey.mail.mrstickypiston.json | 1 - tests/domains.test.js | 86 +++++-- tests/json.test.js | 102 ++++++-- tests/proxy.test.js | 25 +- tests/records.test.js | 220 +++++++++++++----- tests/special.test.js | 29 ++- util/bypassed.json | 5 +- util/reserved.json | 4 + util/wildcards.json | 3 - 50 files changed, 372 insertions(+), 203 deletions(-) delete mode 100644 domains/_gh-is-a-dev-docs-o.docs.json delete mode 100644 domains/_gh-is-a-dev-docs-o.json delete mode 100644 domains/_github-pages-challenge-is-a-dev-docs.docs.json delete mode 100644 util/wildcards.json diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 37adf2e0a..d46f275d0 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -1,9 +1,8 @@ --- name: bug about: Use this template to report any bugs you've encountered related to the project -title: 'What bug did you encounter?' +title: "What bug did you encounter?" labels: bug - --- ### Your subdomain diff --git a/.github/ISSUE_TEMPLATE/questions.md b/.github/ISSUE_TEMPLATE/questions.md index 1e1a07a33..54ce34840 100644 --- a/.github/ISSUE_TEMPLATE/questions.md +++ b/.github/ISSUE_TEMPLATE/questions.md @@ -1,9 +1,8 @@ --- name: question about: Use this template to ask any questions about the service -title: 'Whats your question' +title: "Whats your question" labels: question - --- ### Your question diff --git a/.github/ISSUE_TEMPLATE/report-abuse.md b/.github/ISSUE_TEMPLATE/report-abuse.md index c25ca4e37..3e1a09807 100644 --- a/.github/ISSUE_TEMPLATE/report-abuse.md +++ b/.github/ISSUE_TEMPLATE/report-abuse.md @@ -1,9 +1,8 @@ --- name: report-abuse about: Use this template to report abusive domains -title: 'Report abuse' +title: "Report abuse" labels: report-abuse - --- ### Domain diff --git a/.github/ISSUE_TEMPLATE/suggestions.md b/.github/ISSUE_TEMPLATE/suggestions.md index d30835232..e59941e31 100644 --- a/.github/ISSUE_TEMPLATE/suggestions.md +++ b/.github/ISSUE_TEMPLATE/suggestions.md @@ -1,9 +1,8 @@ --- name: suggestion about: Use this template for feedbacks and suggestions -title: 'Feedback/suggestion' +title: "Feedback/suggestion" labels: suggestion - --- ### What do you want added? diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md index dbe3c3030..e75c23499 100644 --- a/.github/ISSUE_TEMPLATE/support.md +++ b/.github/ISSUE_TEMPLATE/support.md @@ -1,9 +1,8 @@ --- name: support about: Use this template if you need any support with your domain -title: 'Support' +title: "Support" labels: support - --- ### Your subdomain diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 55852cbb7..ec6f221ec 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,6 +9,7 @@ IF YOU DO NOT FILL OUT THIS PR TEMPLATE TO ITS ENTIRETY, YOUR PR WILL BE IMMEDIA + - [ ] I have **read** and **understood** the [Terms of Service](https://is-a.dev/terms). - [ ] I understand my domain will be removed if I violate the [Terms of Service](https://is-a.dev/terms). - [ ] My file is in the `domains` directory and has the `.json` file extension. diff --git a/.github/labeler.yml b/.github/labeler.yml index 7dc30bf5a..829d5e003 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,6 +1,6 @@ domain: - - domains/*.json + - domains/*.json documentation: - - ./*.md - - ./**/*.md + - ./*.md + - ./**/*.md diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 24ffbfc00..e0891daae 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -1,13 +1,13 @@ name: Pull Request Labeler on: - schedule: - - cron: '*/10 * * * *' + schedule: + - cron: "*/10 * * * *" jobs: - labeler: - runs-on: ubuntu-latest - steps: - - uses: docker://docker.io/ilyam8/periodic-pr-labeler:v0.1.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_REPOSITORY: ${{ github.repository }} - LABEL_MAPPINGS_FILE: .github/labeler.yml + labeler: + runs-on: ubuntu-latest + steps: + - uses: docker://docker.io/ilyam8/periodic-pr-labeler:v0.1.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: ${{ github.repository }} + LABEL_MAPPINGS_FILE: .github/labeler.yml diff --git a/domains/_gh-is-a-dev-docs-o.docs.json b/domains/_gh-is-a-dev-docs-o.docs.json deleted file mode 100644 index abe176347..000000000 --- a/domains/_gh-is-a-dev-docs-o.docs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "is-a-dev", - "email": "admin@is-a.dev" - }, - "record": { - "TXT": "2aeb08f313" - } -} diff --git a/domains/_gh-is-a-dev-docs-o.json b/domains/_gh-is-a-dev-docs-o.json deleted file mode 100644 index 5660dabeb..000000000 --- a/domains/_gh-is-a-dev-docs-o.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "is-a-dev", - "email": "admin@is-a.dev" - }, - "record": { - "TXT": "30e221e0a1" - } -} diff --git a/domains/_github-pages-challenge-is-a-dev-docs.docs.json b/domains/_github-pages-challenge-is-a-dev-docs.docs.json deleted file mode 100644 index 713a46f89..000000000 --- a/domains/_github-pages-challenge-is-a-dev-docs.docs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "is-a-dev", - "email": "admin@is-a.dev" - }, - "record": { - "TXT": "18b49a8904257ea06c3595614d9a4e" - } -} diff --git a/domains/_minecraft._tcp.mc.3gee.json b/domains/_minecraft._tcp.mc.3gee.json index 692541beb..ca7a9f426 100644 --- a/domains/_minecraft._tcp.mc.3gee.json +++ b/domains/_minecraft._tcp.mc.3gee.json @@ -1,10 +1,8 @@ { "owner": { "username": "3geETR", - "email": "egemacun@gmail.com" }, - "record": { "SRV": [ { diff --git a/domains/amiyo.json b/domains/amiyo.json index 8237096ed..49bef67c7 100644 --- a/domains/amiyo.json +++ b/domains/amiyo.json @@ -2,7 +2,6 @@ "owner": { "username": "DevAmiyo", "email": "devamiyosp@gmail.com", - "discord": "Amiyo#7978", "twitter": "AmiyoTweets" }, diff --git a/domains/devmatei.json b/domains/devmatei.json index 219bacf68..0f7ac0edf 100644 --- a/domains/devmatei.json +++ b/domains/devmatei.json @@ -18,6 +18,5 @@ "/hating": "https://hate.is-a.dev" } }, - "proxied": true } diff --git a/domains/generic2.json b/domains/generic2.json index 72307e914..5c812ab87 100644 --- a/domains/generic2.json +++ b/domains/generic2.json @@ -4,7 +4,6 @@ "discord": "1194494419064328296", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.MTsG19pQNdLCwl95D9NzxouR4mZ-7y2uRcBVVIqCc9Tal1P0D-Qt4JsDR7K-YJWNqRZpTx3-BZzMXweeteboVNF3fDlh06XENgnd2PoxjeGZzovR9sMqn4Ngl9dpGgYsmZgWf7rTjSzzePZx5h-GbTD5mI6ysxda0zrpR-cwjKVv92Lf6T0XTCwxH10DgAXZ_CtUrDq9Sn5pO-ONbUnnRgVDqBW9unD4qSCcKOAAJurGfYfLNX8qYZWfD-Hcs_wptS8fJpjpXIGkP_JF1qsj95pG0t4Bp7hhIXeXm1jmJm2-C-WQkKdZLdBDQ1gIsDhP0fLNfmSyyy532aIbR1FDqA.qX2TYd3WzaYOeAOktSXu5A.7ojhiDUioav23zhWk7sP9yLVAfNvOxL6bTAn78ILURWTwI5pEQWJloCfImCpjwGuoteHerCQNTJLRD8Vvhvd87X6YvbCiJqRPJp77J-VeJICLN5DAFlzeCNGUX4g8c_t.VThkX88tara8h8WKOXlreg" }, - "record": { "CNAME": "paulswebhelp.com" } diff --git a/domains/genericx.json b/domains/genericx.json index 7d56b2a34..8bc7b0824 100644 --- a/domains/genericx.json +++ b/domains/genericx.json @@ -4,7 +4,6 @@ "discord": "1194494419064328296", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.DNr2jxeR-0YVkAChAl4uPX31TrkGI4S8REI18sZvz4gGrL9c2LRtnnHlJfq0fMntFjAvLoD2lvb-kbjDq-INycXI0YHr-MG4YIvJmccyAmaxmtfhIqSWQc6EwMRar7mx0aE3NaOXJSKZQSpH86MVHqO4X9TZMGxkCfq9IAaXHmAVBazCNPFySzCY2jHo3LRmDFsJyTf0mWm_RwaYuPlS7__slgs2XQnWCYNP_kdMwENR7dDFVG9IjwSXQI-D12nyqquN_oM6WDg2ajfwMdbfd3aOpNkLOvAj-slpw81v2zccP040MrQJdTlN_LiMGFMqUPqNqev3lDwu-up8xDKIzQ.Fq8v4wlDvYQWahwdgcSXPQ.b_b4xs8S2pJNAPSPFJfZ6u5nMlNfAnxnm0UbH_LrqXCGIMX5ymm54wsnWFrymwp9OSqTbotZeYMFXWZlCouMxXOqrOmLHb58OJmsRZarQ0lqSOduCvFnonngL6gTpa1s.1o8XkyzrR4qKrVrinRJhzQ" }, - "record": { "CNAME": "paulswebhelp.com" } diff --git a/domains/generix.json b/domains/generix.json index 5ed469896..f794a11d2 100644 --- a/domains/generix.json +++ b/domains/generix.json @@ -4,7 +4,6 @@ "discord": "1194494419064328296", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.TEnVT2QVvesNKLztHkI3jp-5JggHFHs0jLf93VH0_CT63TcEHlhkMGl6iE1iXGGfW4kjuOkyDfTgxYWHGfHGM9KJ3O57NCNxSPVcK_t-IrImmymmEXrxLKSnyI1QFxBiFpNO7mFIGy7xAWJSTkA5ZvGciR_tJRbB9ftAme5WYLKE7tPgfQxMHoGFE22Q1yKpK9lbCFoeFi0bLtbYRvvveBP78oqK4cMIRkVC6TKhFHo6wWorsJDlEGrVCYQ8-OEP2Y1pu1WkVLJ1Dd1E2OJcZcEn-QmTkfU7ar4U_2LlNTRmDnoXhQNt5O6xsh6savYjm1jzl_u_fZwlgVFgRV9_WA.hEaGKy3NTYfzyeqez2Y5KA.j0OHFUF5Pbr8c7dqb0X0GPIZL4y3gvGLf-BkXNMeWvUwVTfS2S5HD6RpnbDmpnhnwRbX4_fKcEMBLAwkf0Mv0cCUGk4yr9vu_kYH_s8as3q2_2cKJe8P-7wQCioS6lwn.Lv4G5WOkVnbHCssVDM_rww" }, - "record": { "CNAME": "paulswebhelp.com" } diff --git a/domains/gua.json b/domains/gua.json index 39fe7c09d..2ed932281 100644 --- a/domains/gua.json +++ b/domains/gua.json @@ -4,7 +4,6 @@ "discord": "849563829213593612", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.O62knFs7eQLZDKSjl1QUok_vd0iNXQEJVqDjfxRYJyMh6SBBWau4c-34j7mwYJJQCiig5dxl-0cmAQHprDtaCLyPv9ghabRTxNQJQXvF7ma_ron-4DeY9zI5o0hNKYV79qCQpt69FKFBbXvTIPL4grWpYaTVKoFwj2hWl3ZPU__5k3KhkMdZ6TLye-5qL713evGj3JNTYU3JQO4vR-d1VMnfeNHEfTOy1kmhbYuflBMFavXIKuPvqsy1JLg3gd7cD63jdHzG1OJsfUJvuIlTrSvlwA05DXRA0zB2ghUffmneHZfHPY2POWcGWZ2FWO0A1cRngeEjr1p9kTf2KKkauA.FDux7AQQpBXF5CT30_p1zw.vnxZM4mTxTdAb6UZ1Zz5gMJOX0Ody00WHJ8Fkt-IrUzpF_DpwROis9UmFsE9rbwxlD9lCMefKeNoIolm-Fn4DpMcsVy9gIOx4oR3hRw0TLs.XuBHoK_I8bzxVtE8vUBJbg" }, - "record": { "CNAME": "yywbadm.github.io" } diff --git a/domains/hongson.json b/domains/hongson.json index 67d32b7d2..98543bc3e 100644 --- a/domains/hongson.json +++ b/domains/hongson.json @@ -4,7 +4,6 @@ "discord": "1221370693959286892", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.U-QKtaxmfpnD4gyKpxceyXEJniqrouqFqMLOUr-R5US7q9t7CgEfpFVf1ICJC22NBFQDIZupwEWf0ggOhHjcRcq5ptxy5fMav6RNrt7luJzeDwdgFroBFbg2XjlY5ArfsJiPqEAJJspN3wt9cGoxb2WG6MQHwID90F3cS4PijOnThMX9h-qkOzXzCUwch4ex2qa7_MsQKbaEICSMJDphr1bX5FCUCMqFmRTF5LltjhLBh65zEXHPZZiKKZVWmbb4ENWv-C6PlSX2W2NrtbWn6AJBafdOTDKH2gFw2nbZMc-BpQB93PKcsHnMpyaUEuGE6miZwt-yP9RwI0hRRheDw.Su7jI9kAzVy63eUkcb2qVQ.m9-XLef-CoAmPkHyXSfzyZeDUQW0FliIJ_E91X6oD4B-3aoItG32mUMGDlNntwzOk1CbbSUXQDLY7q2zoHP-A.aQsLYDPrqxn-VyenjREoeA" }, - "record": { "CNAME": "hongson209.github.io" } diff --git a/domains/jbmbhs.json b/domains/jbmbhs.json index 02742b989..d7f73b47f 100644 --- a/domains/jbmbhs.json +++ b/domains/jbmbhs.json @@ -3,7 +3,6 @@ "username": "jbmbhs", "email": "juan@belmontemarin.com" }, - "record": { "URL": "https://www.linkedin.com/in/juan-belmonte-821175112/" } diff --git a/domains/julianwe17.json b/domains/julianwe17.json index a3dbbc5c4..6b28bb722 100644 --- a/domains/julianwe17.json +++ b/domains/julianwe17.json @@ -4,7 +4,6 @@ "email": "julian.in.hbr@gmail.com", "discord": "1055740356764901437" }, - "record": { "CNAME": "julianwe17.github.io" } diff --git a/domains/kleein.json b/domains/kleein.json index eb63f4475..391669f4f 100644 --- a/domains/kleein.json +++ b/domains/kleein.json @@ -4,7 +4,6 @@ "discord": "763581985410121769", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.RB8tarmY1z9BCAER0LvmJIvKu0Fx_u6ruXqMwX4aw-v4pZUbhTCKLSf_iR1b_b5WIL8VlKOd4FX2ykUcIOO1goN3vBszT__Edxfir1FYNhMOE3Ywn1oO1K-dPG8Ptsk0B7kuqFbv-0OjXjefixD44g6OYNGy9xxThP0ZJLT3jSOFf3x1O49S1OuibhrElcx41MGjLIms5Fp147ZFVn2p38aZisFKw7Q3yyAaLvJ1uGC1mosVF5CAZbfZxPhUpdvGizMPG9IRzuAQxF6pZf-L4bb1WFMIQYNtTX5o65sMCqIjcWaTK26SdrR-m_r7RudENszlDCuI8eJP3Se_vIVzbA.zbLxAQ7r2w8FxmiDnbIaTw.l11uw6jMkX69_h-55R37CKGZdSlD4KXAUWvaTwGKiTZDzlusNY-YNVzh3gdqTDL8CMCaL8LXfxZHKRaP6wU_5ohHaWB8kzKaW_Kj5dI0MMI.jU93qV2ujuyvYD-oeSF6Pg" }, - "record": { "A": ["15.235.204.212"] } diff --git a/domains/mail.mrstickypiston.json b/domains/mail.mrstickypiston.json index 6f8c5927a..c120e7523 100644 --- a/domains/mail.mrstickypiston.json +++ b/domains/mail.mrstickypiston.json @@ -4,7 +4,6 @@ "discord": "700766242268774471", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.W2mVdm4dW8fJByQKFfFbX7Zy_LgzT03dRrDPZg1smltChY-8Q4ecmRlgbZg3qzCMTpZt0EAYKEvW3ZWJ2YANpH4NSl4rOExGzhByU5yhFxEFMFVu62LvAiEIRErPZLSpisd_p3sz6GNr_2lDhvy-YJHa5nstCGk8504Kfr_nLXwv6bWxpHPaQ_gMC3T3zCJs18znanaLs9A4h8O_07-_AlsKxUBhwyFPHBQv1zG05Dj-MNJXs2E3IiI2L5zwvV3807rvsolppR2et0Ghu6FZMDoq0ETelqjUmM_JW2T6fYiJk95QxRzLh0z4KHv0OcduJTAQT6OYjXDFsUOeOnl_cQ.BLMs-Z8M9F7U-qkpjWKE9g.POwlhWC7vCvZwtTz5pc6NRtbQFBqPK_DpWN7JBeIybylCNrqG9pEw12_qvlTIrb3cRh1ZEtzqLPBrVqyVV00zj8XKuFNZRmDfE7N7LZUebw.525ZlMIJoi8uHFtRgguNag" }, - "record": { "TXT": [ "zoho-verification=zb27779902.zmverify.zoho.eu", diff --git a/domains/mrcat.json b/domains/mrcat.json index b54c9ec57..9572a8e51 100644 --- a/domains/mrcat.json +++ b/domains/mrcat.json @@ -4,7 +4,6 @@ "discord": "1137413640945934418", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.Y8eHPjeSqnG2MUxTMFsvWlhMNNYDsxTheEB8ak8Kiyso-_aGMkwFG_tMPE_2ZBya20BjudXX_gRgAG7YmDuyOP-oBGGP6pms8em_hgNoWxW9SQCfufy4dQ_sMkLNGumobnemmUuzlpMB77EtoBxXiINvyAF_MgoS_G68_6arIRWphBTSAGEaU2Fl7nBYUiArQD4W0wiZwTrwl5PRB6orOSa-SA4bg7k6ZDtxVmYCX1l1k_8ggG9L7oauftJ7yjq58miTUIx02qeCuP_t_p30wHHUbk02yFpJFtnH14xiDRQUCeAh25CibruxR82sDvsTPdsOJDJ-v_cWaenXoxX3Fg.Wjo-oD356QVDbjpXuIdBNg.OPnI-kc3PmzXQR-VR3rYOmFF1Quv56CJnGm-FUMP7WXRK-HW040wF647Sm3hu5KD_mn0gHdOvnVfpwBkKHsWg_eUzJgMlnBCzkT81lIi540.LNJ_5YhJ9zA2Kx8mx27hdQ" }, - "record": { "A": ["31.6.7.25"] } diff --git a/domains/navistar.json b/domains/navistar.json index acf6185df..9822afab7 100644 --- a/domains/navistar.json +++ b/domains/navistar.json @@ -3,7 +3,6 @@ "username": "AShuba", "email": "anatoliy.shuba@gmail.com" }, - "record": { "A": ["138.68.159.126"] } diff --git a/domains/navistar2.json b/domains/navistar2.json index 3dc07f3fa..f22a6eb7b 100644 --- a/domains/navistar2.json +++ b/domains/navistar2.json @@ -3,7 +3,6 @@ "username": "AShuba", "email": "anatoliy.shuba@gmail.com" }, - "record": { "A": ["52.73.119.251"] } diff --git a/domains/nicollas.json b/domains/nicollas.json index c04ae69a3..92d23ea20 100644 --- a/domains/nicollas.json +++ b/domains/nicollas.json @@ -4,7 +4,6 @@ "discord": "233677267975274496", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.Io00BIEcuUaqGqro44tjhxyH2m685YaHnSqyGCNRBTjSndObd2P4HmNoX93X1Qatl7c6ygPxkfUfvvUJZ4igK6WxgxsSa9_hRh61r6AbXKDY1DFmm-0ZjHsNNEQOOoY4NtwT-zVocwhCINVQH6CQCqSkxI1sEikVdzbFCCSVXp35olvH8kRnGRDjLogKqWWhQnSgYI0EeE89ykBNtiW_R5LRogA5nFJW4lQy2DMv-37peuGu1pu-BAsm6iJwFE0OogY01bWwsIhapGjlgQbtY4vJhEOJr4CItQFUKux2VojlrMlfDefkOCZs5v2gjnTeZ6HC9x7RdQBtKUImQYV4Eg.XhW29WnPlnUCIzIUXyRDxg.29_Y-46C5Jl0hT9eq91j3WN2iKmBcKhqXeCtL4BemP72AxqnPAsHR-BM904hTIu80a5-vC30yZ1jxMI6rx9F1KyZHRgZasky140KJ0jTcTPuGmLmMT7szVlfgZ8G1S1YY0DfvFm_QIu-Rld6x5Yl8g.xxUgPNDRzytPy7i36K08gQ" }, - "record": { "CNAME": "nicollas.dev" } diff --git a/domains/nietbeer.json b/domains/nietbeer.json index 001cd015c..de3f3b784 100644 --- a/domains/nietbeer.json +++ b/domains/nietbeer.json @@ -4,7 +4,6 @@ "discord": "814891541205876767", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.NZN_bOggifZEtlA324wg2l2u3hX2MvZuD3yLHULkNX81YRQfOCtvT0IfoXAKV5IMD8GRt8qFAo2Rpw2lOvrTrvlEmjPkO_u0n5ScCZVU6FsXENlBz4zD5hHAes_kd1LCzFOICbmNdLNqWEoMEiNUw6VZiUfuIuqrJXIRXkSFXWQGWYUc_wbzu1oEdKLwNt0IvY4DyQ9pWvCSnsQlhXb7lUJS6iC-VUBoAqZnTuScHpwx5xHXHhFdJu2iiBU8zmroAQTxJ28-DLTuBmIRMQgS-FfZK0i7UQHnZb2f3CdWzi2lmlBQM-NCf8yOzziPAoS8cF1Eh4eQLKerBWlHyCSiyg.r37yi_KvhV0NTbXtet_DHw.PTf0jwkhBjRrEF8mdrsrhSetzO6jeM9XX50rJgv5brt3XwRbYWWaOlZjaLWTBNOuGGlCplqBngPJkB3ycZNUpay8NXKTGwdaSNgQRmi_-O_HbETajYI_zPsfLtjW-DEC.jHnPtvN5bcAswFISD9YBeg" }, - "record": { "CNAME": "nietbeer.pages.dev" } diff --git a/domains/nifle.json b/domains/nifle.json index b657503b3..fa016c2f0 100644 --- a/domains/nifle.json +++ b/domains/nifle.json @@ -4,7 +4,6 @@ "discord": "553939229475078154", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.nRTs07oBPtm7QihIkDqo1f3eBQwtYmpzZZYebo3UsxrJ9gpmPnY42WdO-H0r8XRAwYiwzZjZ8GnmRrG2xwz_8dw49VD0UvvWyJKTR7SSN1XxznSkbGJ3wthb384seNE_Fhg-E6Q6qV9vW8B1U6GD39blKsURHcgpTrSa-qopwXDeFctAo-RcxbmFwr-Mw0Cwr9ia3L1wnqvOSjQbU0a92oVv6293QbSvqgupXkS1ttXoBR9rpDPp8tH9oIXbCK4AhVTKowgIYAYh2iZT41nlkFKeus10yRKw5GqyokBXBdA70qKnU3lCd9VFZ4Eq4DxbSoMNBqk8FADig2MtA5RBFg.CqfMnrP60ibdRwfM4yUB8A.HZl3zu19tbnEz2j4hlejxUJfoEkCk0qsLeHlqLzc1-qXAnH1984_R8joN9l3WWA0Jgr13m8qr-GQsAEcjjdiog.vUXuNT3B9rjoE606ZfrRRA" }, - "record": { "A": ["172.234.178.155"] } diff --git a/domains/nyexoi.json b/domains/nyexoi.json index 44ca0b2ba..b21698a73 100644 --- a/domains/nyexoi.json +++ b/domains/nyexoi.json @@ -4,7 +4,6 @@ "discord": "1212192971164754033", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.nRgrN599r8xvQuvmS0Z9rYahQfr4DHRpFuqCcx0hA7lqvxyfU2bINENKxB9qHUKVLcxxJsVxJhTu9bHMg_lI7CKxDOHfil06iy4biCCDnUCKub8ju3d4YkZoVCBWM5uSHu1BqBjlWD_xKu6jHpV6SwbHbwLpWXSdH-P_KGTgHbaj5NCptvX0s4DdyVZDV5oBqz6VAmqAl0HoSFFnuANz8lfgE9z_yIxK0Rj4u4ce9et9Qkd1QGltI6er9tU2U9LH5X0J7qkA9Cl9sXyO8VwPm70qQfLx-aZ0MZPcHvPNxMiiJ5DxOuvYZS1HQ494nA5ghWQk8WFjvHSiRMaEh5aWBQ.SmcC2sB5sRSC4T9sNkidRw.0Y8OEmwmNVpmr34As2NwAlt-FhlBVOUuYyS8SXHLAh3Q4aYJv55WdwEVNd4u9JWSEwBxYLdajkKFimVzPunQQQqNvfbKGhp3rBdgels_dJU.irZbgI_gDpGkNpagO9e-Nw" }, - "record": { "CNAME": "siteisw.tiiny.site" } diff --git a/domains/redolent.json b/domains/redolent.json index d8ad7ef03..5512e045b 100644 --- a/domains/redolent.json +++ b/domains/redolent.json @@ -4,7 +4,6 @@ "discord": "755718159641608202", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.c0d7ul7E-LX1qEJeFPuXgcpGJvLDeqnotDBs20mJdeqQzpzoMFTGzEYQ3QExt5XVjdX9SzRFpdgGaY04gN_c_Nrx7WaG47ZJL1rNAapJYCUGmysp3W6g2Trwi45_cIaWUEwKGnjBIgp3BTLKO6yentnHJXKjMb5AUkDcZVj69Nly4sCpdUTSjj1Xw6hVtmapS-lGaIlm6iaftk1pEJm1q1uIuDSsrufH2oRF3lVwkmjJDIwD_tf7PXuHRUGgxvt0FK_bLZKnoqbFtpTh9nNg_RBf8H1YnzHhOc6dkjf6ikBBzcQDutiKxelMupFmatlU5eAGCBmKkEUwxtSKsp5jQQ.R8WtRKhJLz0P5qUPEEdXZg.oEOJF1FocJn0FqQ1P0RaKVK4G1RoQT6E3oyRUpMg_lv0UXDwn16BlIUcKowUWxiObofg1YKRgB1OM4uIZPjxbAYJwkS-Q4Hf0CTmeZCjCaVpaeNc20Z9dREuphe4He30.jP6ZbMY8WRHngmBV6kRBsg" }, - "record": { "CNAME": "redolent.pages.dev" } diff --git a/domains/region.json b/domains/region.json index f9cd5da52..2434bc609 100644 --- a/domains/region.json +++ b/domains/region.json @@ -4,7 +4,6 @@ "discord": "1264096408395317289", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.WNRBeRSr5EzISmqLUQ2fxgAxern45vcHBcO0OhY8NGPm-MnxKCTOc6yWhmDfS3Mu28S9xI_WG3uQ46SYdVfIQKKoY8kGvirmXpftzJ3we_IqMgEH-7MyG35R0fnxQm6LMVKY41LncduwA1jh9sKmGk30oYcWU1u410j_ZxNGr2yzE17vZjJVBUxGFpRR2Rz3QyKTkHeBLWdTEfCSAYIv7JgJ0IH-iYN7DtqCjn2GGJPEMJYNVpivfUKPCNEqr29_f7clFJHifnmDKLG1BjQFitpO0YOyVTeqYwK0lcig5klf0QNTbJ7irj5uWokMkgKeTcQ1yYsKV4-Io0lTGW0ACA.FBJGaklyR9Ew9uB3rumREQ.tiWkr-YgRATVbC7ZHY6iAzEkcSPA8xCI4nYgQ9m-4k9JZ0hM8FgM7YpZW3Nuv7fl0S4s-QyHX8bilZQnQuQvTZ0AMMI7swTarwu4mvAXkr4.RAYWmatCs8lPwxLir16DVA" }, - "record": { "CNAME": "regioniosvn.github.io" } diff --git a/domains/s97.json b/domains/s97.json index af0de1cc5..d9ffc7ac1 100644 --- a/domains/s97.json +++ b/domains/s97.json @@ -2,7 +2,6 @@ "owner": { "username": "Saud-97", "email": "saud.aljaffer@gmail.com", - "discord": "S97#6758" }, "record": { diff --git a/domains/safety.json b/domains/safety.json index bae202e84..f4fdcb48e 100644 --- a/domains/safety.json +++ b/domains/safety.json @@ -3,7 +3,6 @@ "username": "HackingYZ", "email": "sifed@qq.com" }, - "record": { "CNAME": "safety22w413a.github.io" } diff --git a/domains/sq.json b/domains/sq.json index 23539dfc1..e5d58ce32 100644 --- a/domains/sq.json +++ b/domains/sq.json @@ -2,7 +2,6 @@ "description": "sqec's website", "owner": { "username": "SquareScreamYT", - "discord": "918475812884344852" }, "record": { diff --git a/domains/tofu.json b/domains/tofu.json index ab50644a4..bc813bb58 100644 --- a/domains/tofu.json +++ b/domains/tofu.json @@ -4,7 +4,6 @@ "discord": "1009412927754866728", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.cZujVSVhansXZskEDTwKI9pcw2Leo2FuKUY12bFLgBv8degT9VaRgOSn7Z4evuLzwINGhnhaweh-Xgo8pUWGOqrO_bDMRyxcIItpx_mGVTMaSZy5SS_aUqGeWbOpsq1oKDGDBumKjJd82m-KXJFq9VEybWOp2B5CVq_dzFC9tzJu-Uu_-0uuC1qRhPeQJHBl1FIgPlyo_bmFoJ_Ow7p7anUonv3zTkqBwPXSyde_BBMzXYU437yharMqo6kZK7N3CVFHoXIg_4aqipW2x-KwGllezQZI8ig3ZvQfLOXDuAwxDRdlwOHQnGlLpSZSZTfVCToifGo--0X6Ml0YHYry9A.Ch4kkhWBAEOJYbdFZyOxZA.Md97JISmrKUauMgTU3ounghyfbxUYW0-M-dedQA7IMlEUE0L08SaYAxh6z88b-7GtuwpszkbxQM9geUOvIl1H3bXfOJqaDFIRlBDgl_Vp4Q.djUuJgDKO_tQYYX_Sa0vLg" }, - "record": { "CNAME": "yychen1201.github.io" } diff --git a/domains/usekyber.json b/domains/usekyber.json index e7204eda1..b08eb49b1 100644 --- a/domains/usekyber.json +++ b/domains/usekyber.json @@ -4,7 +4,6 @@ "discord": "1335907071287230527", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.mUg0h0vs51TZlH_HhPFCqQvSXzhsEa9nWRE_vKRN7AWyU2jSneGFQopQ5Lj__CLtmRDCd60W0wYjH8FEqUjYaquACMvfkG2KrU-F6Ht8efv-g6fvQSnEpFeCy4jaeOI0WqCfwoDY8AAaH2daMX3CrLhrJAVD-CNm5sjssElj77cmDhU1Z0m2WCp__Akt-uDNc2VUVlUpDfqhV9b8pgEX-NfSMAU0kL-v1B037PVUCBPj_obfJyOUDj72lTcl5uYoJlkIiUbsfvWAIvbP2i_0xxAXXhuyfTnD1a_2FAXmKegzUmM9kjgao1RNWUAXo_sgydw0IxevpVgI-GhZgl09CA.WkO0f1qjPnhPD4YI1U_buA.Vj5CjME69F7g0jEiXmgD0OUNf7GpLBCRuI0Ap5sE67A0D0dWYoKPyE6c5Jy-8U5UuCic01BnIhP3SKeQ4u3ZiCjXkjfeYaXba_UIcOdWBpw.Qm7MtmHkzZBCmWtDpIMY7g" }, - "record": { "CNAME": "0fd7817ec6-hosting.gitbook.io" } diff --git a/domains/wave.json b/domains/wave.json index fa08df710..61d82cb6f 100644 --- a/domains/wave.json +++ b/domains/wave.json @@ -4,7 +4,6 @@ "discord": "1273579466936815717", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.VQbRFqL4oyeBRF7H8wmvWeQR00tQnJnL2c0Yc--s4fbY_z_gr-LC7j6Ep_s-mStGfFpmnGZxPAz89WkApt6__tftZ8oClYEbRQJyN7jtoOHO86GNYMxcvQJ2ngNqxjADWrWROLR2uI9c0VZryiZFLfDXkfl0WbtTl2UvndEnjCVwNyIuv8L67P1p9p0ODDyKIcztIkDEROfD46mWthqIcElcWxNuCXMsPYgtBXYn6O6SrQWHhilzEsvLHe8BEMESAfpxvOH7clAWLVLIAmEmNNnoecLwse_z3k8pZHJQDOifr8k5t8FoRNhPH5QYFAXGfk4Mi_jCFUPZV9cwjJa0gA.EkJAMMF4R2XX-bBYIFnfQg.K1R0AqjrIzfN5_rcJit1g8JFU4DxBqL9Wq8nGU3Rhka93TEfxiRYSi5C0RFtt3i-OH_FxwePHkLCDDMDLE4fFFl8bQplvGRoXw-_QY5Czqf2bH6GtsIpt0viog_2l4h5.khbF7ESzWSSPeYTADVcsyg" }, - "record": { "CNAME": "wave.fwh.is" } diff --git a/domains/xgeneric.json b/domains/xgeneric.json index 62bace35a..53f4098c4 100644 --- a/domains/xgeneric.json +++ b/domains/xgeneric.json @@ -4,7 +4,6 @@ "discord": "1194494419064328296", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.D232zLsD29QIoCDQBNjD76jn7VgIPpSOIrRPBMn37VV_JTS_3fJAKK7ADQtFwQu0A-I0TcZTU3UczrEGdwjmkHHAhPu95BuRbFqbWruAnX6ETw0JjSJQvYmlrFjF1xDMM33CJ3GW0R985HyTcB5MbU6-QvWbqPou5bwRShlQ06KKP944EiASahDDNAog2HUwEf7VJjWxdB-hP3Yj_BOvlC_kQBfZBhOTG4OWwbvbAonKjK26oqrVdUKhuDT0VfvI4VsBXlSG3g8P2LnyZZPmh3xJ3UQ4aWYRFhJkC3f0M98NQ4mI7ddwZu4YPVcw9yHiMD9iDnTBnNiSsJVZeMhqQw.6v7QP1iKQEXF2xIliVLoxA.n1gPGIhivHdAaq9enhjewqRKzW2BtPsOt97Ng4x7yp8nv-OzAS4Jev1hp_M3z0XL7l5z1Wc2YrPW7z3trdUlmTZkCLcOziKhwwECaKbQNErOq3yXDxe7K5FvhmQWGNQJ.fZiP_f8z_xpVs5jS0MRQPQ" }, - "record": { "CNAME": "paulswebhelp.com" } diff --git a/domains/zalex.json b/domains/zalex.json index 006338ddf..fd77b578a 100644 --- a/domains/zalex.json +++ b/domains/zalex.json @@ -4,7 +4,6 @@ "discord": "1212435420776890368", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.N0_TVOrIKQHS-dgU5KDDcREwJDAtW1AfGLARAqAZyT-UjrmJz8IUFHg8zYxe6Spa4faQVR_emyVZKwqwlFvdIZZr4yQrWQSED-2WZJ5Z5DXpti6930sHO4CVgszWKjc5LqPW1764QP39iQrC7VtNSFxEmZTWJnmK0i8X_2AOSgu8BTH45vjMVKU4oBRzHjvoBZ-Z_17DCk0Awy2FxWSscZPDVF1-_1ETfQ60Ahcv8gYcMt3ZVs2vrUZR_sopt8LaPf6AQQ9zSgDtRiwBHogpiYWsAZVN_5EHTKosomGhUcxuHfUjhaHFauscXQjHZM6kDOEAEvY8MryV7jRy_gm7fQ.sZCseMTkxIHnGcrpk7SARA.SHzeybFf2FVb38kuLc62-X3zAK2SMpZiL2FlnaU77-UR5bsGoINyEnbJNdvCRd4nLItafWpWtCqu0NyvjBh8BWCNrCUhYMmmLRzg6sBgolI.kE2nsD9RtiZGMS-KFaXmZw" }, - "record": { "CNAME": "zalex.betteruptime.com" } diff --git a/domains/zmail._domainkey.aruria.json b/domains/zmail._domainkey.aruria.json index 04ae8e7d7..33b32cc16 100644 --- a/domains/zmail._domainkey.aruria.json +++ b/domains/zmail._domainkey.aruria.json @@ -4,7 +4,6 @@ "discord": "1175481072088268920", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.XlWqBdmbdUC_mgDhKMY0Hcl1_FRp5IxKkBD1UF2bGowx-BgYpv7UnElAdcrktTrHjJLD75zzEWNR8A_1UH7-4abrnY4lsqu2p9GIScw9j-9zrNZi_EeTmN8XRuD2fVvPFEVmzAQ7O9jE-B6fkMl4GybJB6td05nxzwHi5J-cDGzT1Wg2qu5ierWuHe7P8TI4tq-SwshaxpNTWkMJN9mgGie6QD7zXBo76G7lbFWTOJHM65UK81I2N8nmyttlD2E5ncNgMTyspkR0hmKeIb1cQvR4lVXu3n-NmJg4-PIOMP3BJ_FgiZFQEDps_opWCA-XhcET7C_EjCbZPEJlBfuTxQ.GFEDQow6ltp5UmM6d7EqfA.xoHXb_B_eC2HGsJ-7iTlZ0FAagE6icNiiVRILA3y5YPiC8chzN3t1JpWEP-uyODEUi7HDGVJzPhRwtTBSbY4S4lx4ZxVOIMr2-l5v50hTjo.ebOtxNCyuP2tf0zsqTg8Hg" }, - "record": { "TXT": "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKr1YCFtXzTufNgvRlYuDw72rzN8WBF+F8xNRtI5PwvfVyFEAS7saeRf6hqQ28hdqH8FFmJ9479UkP0023gyUyQcpRQnqu01InfoyPCIicCRv/WQBTKyb0YXMtrF3ANZHBDq0p2lcp/naUtPs2oQEuSI5Ih+SfsCs5HnCRTyV2DQIDAQABl" } diff --git a/domains/zmail._domainkey.mail.mrstickypiston.json b/domains/zmail._domainkey.mail.mrstickypiston.json index fd2959af3..052b699ad 100644 --- a/domains/zmail._domainkey.mail.mrstickypiston.json +++ b/domains/zmail._domainkey.mail.mrstickypiston.json @@ -4,7 +4,6 @@ "discord": "700766242268774471", "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.W2mVdm4dW8fJByQKFfFbX7Zy_LgzT03dRrDPZg1smltChY-8Q4ecmRlgbZg3qzCMTpZt0EAYKEvW3ZWJ2YANpH4NSl4rOExGzhByU5yhFxEFMFVu62LvAiEIRErPZLSpisd_p3sz6GNr_2lDhvy-YJHa5nstCGk8504Kfr_nLXwv6bWxpHPaQ_gMC3T3zCJs18znanaLs9A4h8O_07-_AlsKxUBhwyFPHBQv1zG05Dj-MNJXs2E3IiI2L5zwvV3807rvsolppR2et0Ghu6FZMDoq0ETelqjUmM_JW2T6fYiJk95QxRzLh0z4KHv0OcduJTAQT6OYjXDFsUOeOnl_cQ.BLMs-Z8M9F7U-qkpjWKE9g.POwlhWC7vCvZwtTz5pc6NRtbQFBqPK_DpWN7JBeIybylCNrqG9pEw12_qvlTIrb3cRh1ZEtzqLPBrVqyVV00zj8XKuFNZRmDfE7N7LZUebw.525ZlMIJoi8uHFtRgguNag" }, - "record": { "TXT": "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCQzqCyycL/D4W2wxwRFdiQuDNf0ityvD6KD71b67nse9rbSgQ+03F/Yt7F19nPvnmgSElmaf7yUcQajw2Nhr4xAK95NUgBkjuF4ofkXZnqw7fyVz5JdVU504yPXzLCj5SxSU2Rbu5WS+rXr0P86jjUfNWVPs30p3RTgJDJRoQgBQIDAQAB" } diff --git a/tests/domains.test.js b/tests/domains.test.js index 46a4339fb..90262cdef 100644 --- a/tests/domains.test.js +++ b/tests/domains.test.js @@ -3,7 +3,9 @@ const fs = require("fs-extra"); const path = require("path"); const domainsPath = path.resolve("domains"); -const files = fs.readdirSync(domainsPath).filter((file) => file.endsWith(".json")); +const files = fs + .readdirSync(domainsPath) + .filter((file) => file.endsWith(".json")); const domainCache = {}; @@ -13,11 +15,15 @@ function getDomainData(subdomain) { } try { - const data = fs.readJsonSync(path.join(domainsPath, `${subdomain}.json`)); + const data = fs.readJsonSync( + path.join(domainsPath, `${subdomain}.json`), + ); domainCache[subdomain] = data; // Cache the domain data return data; } catch (error) { - throw new Error(`Failed to read JSON for ${subdomain}: ${error.message}`); + throw new Error( + `Failed to read JSON for ${subdomain}: ${error.message}`, + ); } } @@ -44,23 +50,32 @@ t("Nested subdomains should not exist without a parent subdomain", (t) => { if (subdomain.split(".").length > 1) { const parentSubdomain = getParentSubdomain(subdomain); - t.true(parentSubdomain && files.includes(`${parentSubdomain}.json`), `${file}: Parent subdomain does not exist`); + t.true( + parentSubdomain && files.includes(`${parentSubdomain}.json`), + `${file}: Parent subdomain does not exist`, + ); } }); }); -t("Nested subdomains should not exist if the parent subdomain has NS records", (t) => { - files.forEach((file) => { - const subdomain = file.replace(/\.json$/, ""); +t( + "Nested subdomains should not exist if the parent subdomain has NS records", + (t) => { + files.forEach((file) => { + const subdomain = file.replace(/\.json$/, ""); - if (subdomain.split(".").length > 1) { - const parentSubdomain = getParentSubdomain(subdomain); - const parentDomain = getDomainData(parentSubdomain); + if (subdomain.split(".").length > 1) { + const parentSubdomain = getParentSubdomain(subdomain); + const parentDomain = getDomainData(parentSubdomain); - t.true(!parentDomain.record.NS, `${file}: Parent subdomain has NS records`); - } - }); -}); + t.true( + !parentDomain.record.NS, + `${file}: Parent subdomain has NS records`, + ); + } + }); + }, +); t("Nested subdomains should be owned by the parent subdomain's owner", (t) => { files.forEach((file) => { @@ -72,9 +87,48 @@ t("Nested subdomains should be owned by the parent subdomain's owner", (t) => { const parentDomain = getDomainData(parentSubdomain); t.true( - data.owner.username.toLowerCase() === parentDomain.owner.username.toLowerCase(), - `${file}: Owner does not match the parent subdomain` + data.owner.username.toLowerCase() === + parentDomain.owner.username.toLowerCase(), + `${file}: Owner does not match the parent subdomain`, ); } }); }); + +t("Subdomains containing an underscore can only have specific records", (t) => { + files.forEach((file) => { + const subdomain = file.replace(/\.json$/, ""); + + if (subdomain.includes("_")) { + const data = getDomainData(subdomain); + const recordKeys = Object.keys(data.record); + + if ( + subdomain.startsWith("_acme-challenge.") || + subdomain.includes("._domainkey.") + ) { + t.true( + recordKeys.every((key) => + new Set(["TXT", "CNAME"]).has(key), + ), + `${file}: This type of subdomain can only have TXT or CNAME records`, + ); + } else if ( + subdomain.includes("._tcp.") || + subdomain.includes("._udp.") + ) { + t.deepEqual( + recordKeys, + ["SRV"], + `${file}: This type of subdomain can only have SRV records`, + ); + } else { + t.deepEqual( + recordKeys, + ["TXT"], + `${file}: Subdomains with underscores can only have TXT records`, + ); + } + } + }); +}); diff --git a/tests/json.test.js b/tests/json.test.js index e6f77d5df..847cf0259 100644 --- a/tests/json.test.js +++ b/tests/json.test.js @@ -6,29 +6,30 @@ const ignoredRootJSONFiles = ["package-lock.json", "package.json"]; const requiredFields = { owner: "object", - record: "object" + record: "object", }; const optionalFields = { proxied: "boolean", - redirect_config: "object" + redirect_config: "object", }; const requiredOwnerFields = { - username: "string" + username: "string", }; const optionalOwnerFields = { - email: "string" + email: "string", }; const optionalRedirectConfigFields = { custom_paths: "object", - redirect_paths: "boolean" + redirect_paths: "boolean", }; 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 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 reservedDomains = require("../util/reserved.json"); @@ -52,7 +53,9 @@ function expandReservedDomains(reserved) { } expandedList.splice(expandedList.indexOf(item), 1); } else { - throw new Error(`[util/reserved.json] Invalid range [${start}-${end}] in "${item}"`); + throw new Error( + `[util/reserved.json] Invalid range [${start}-${end}] in "${item}"`, + ); } } }); @@ -87,7 +90,11 @@ function validateFields(t, obj, fields, file, prefix = "") { const fieldPath = prefix ? `${prefix}.${key}` : key; if (obj.hasOwnProperty(key)) { - t.is(typeof obj[key], fields[key], `${file}: Field ${fieldPath} should be of type ${fields[key]}`); + t.is( + typeof obj[key], + fields[key], + `${file}: Field ${fieldPath} should be of type ${fields[key]}`, + ); } else if (fields === requiredFields) { t.true(false, `${file}: Missing required field: ${fieldPath}`); } @@ -95,9 +102,18 @@ function validateFields(t, obj, fields, file, prefix = "") { } function validateFileName(t, file) { - t.true(file.endsWith(".json"), `${file}: File does not have .json extension`); - t.false(file.includes(".is-a.dev"), `${file}: File name should not contain .is-a.dev`); - t.true(file === file.toLowerCase(), `${file}: File name should be all lowercase`); + t.true( + file.endsWith(".json"), + `${file}: File does not have .json extension`, + ); + t.false( + file.includes(".is-a.dev"), + `${file}: File name should not contain .is-a.dev`, + ); + t.true( + file === file.toLowerCase(), + `${file}: File name should be all lowercase`, + ); // Ignore root domain if (file !== "@.json") { @@ -106,12 +122,27 @@ function validateFileName(t, file) { t.regex( subdomain + ".is-a.dev", hostnameRegex, - `${file}: FQDN must be 1-253 characters, use letters, numbers, dots, or hyphens, and not start or end with a hyphen.` + `${file}: FQDN must be 1-253 characters, use letters, numbers, dots, or hyphens, and not start or end with a hyphen.`, + ); + t.false( + expandedReservedDomains.includes(subdomain), + `${file}: Subdomain name is reserved`, + ); + // Disallow nested subdomains above reserved domains + t.true( + !expandedReservedDomains.some((reserved) => + subdomain.endsWith(`.${reserved}`), + ), + `${file}: Subdomain name is reserved`, ); - t.true(!expandedReservedDomains.includes(subdomain), `${file}: Subdomain name is reserved`); - if (subdomain.split(".").length === 1 && !exceptedDomains.includes(subdomain)) { - t.false(subdomain.startsWith("_"), `${file}: Root subdomains should not start with an underscore`); + const rootSubdomain = subdomain.split(".").pop(); + + if (!exceptedDomains.includes(rootSubdomain)) { + t.false( + rootSubdomain.startsWith("_"), + `${file}: Root subdomains should not start with an underscore`, + ); } } } @@ -119,13 +150,19 @@ function validateFileName(t, file) { t("JSON files should not be in the root directory", (t) => { const rootFiles = fs .readdirSync(path.resolve()) - .filter((file) => file.endsWith(".json") && !ignoredRootJSONFiles.includes(file)); + .filter( + (file) => + file.endsWith(".json") && !ignoredRootJSONFiles.includes(file), + ); t.is(rootFiles.length, 0, "JSON files should not be in the root directory"); }); t("All files should be valid JSON", (t) => { files.forEach((file) => { - t.notThrows(() => fs.readJsonSync(path.join(domainsPath, file)), `${file}: Invalid JSON file`); + t.notThrows( + () => fs.readJsonSync(path.join(domainsPath, file)), + `${file}: Invalid JSON file`, + ); }); }); @@ -135,7 +172,10 @@ t("All files should not have duplicate keys", (t) => { const rawData = fs.readFileSync(`${domainsPath}/${file}`, "utf8"); const duplicateKeys = findDuplicateKeys(rawData); - t.true(!duplicateKeys.length, `${file}: Duplicate keys found: ${duplicateKeys.join(", ")}`); + t.true( + !duplicateKeys.length, + `${file}: Duplicate keys found: ${duplicateKeys.join(", ")}`, + ); }); }); @@ -159,17 +199,33 @@ t("All files should have valid required and optional fields", (t) => { // Validate optional fields for top-level and redirect config validateFields(t, data, optionalFields, file); if (data.redirect_config) { - validateFields(t, data.redirect_config, optionalRedirectConfigFields, file, "redirect_config"); + validateFields( + t, + data.redirect_config, + optionalRedirectConfigFields, + file, + "redirect_config", + ); } // Validate email format if (data.owner.email) { - t.regex(data.owner.email, emailRegex, `${file}: Owner email should be a valid email address`); - t.true(!data.owner.email.endsWith("@users.noreply.github.com"), `${file}: Owner email should not be a GitHub no-reply email`); + t.regex( + data.owner.email, + emailRegex, + `${file}: Owner email should be a valid email address`, + ); + t.false( + data.owner.email.endsWith("@users.noreply.github.com"), + `${file}: Owner email should not be a GitHub no-reply email`, + ); } // Ensure 'record' field is not empty - t.true(Object.keys(data.record).length > 0, `${file}: Missing DNS records`); + t.true( + Object.keys(data.record).length > 0, + `${file}: Missing DNS records`, + ); }); }); @@ -180,7 +236,7 @@ t("Reserved domains file should be valid", (t) => { t.regex( item, subdomainRegex, - `[util/reserved-domains.json] Invalid subdomain name "${item}" at index ${index}` + `[util/reserved-domains.json] Invalid subdomain name "${item}" at index ${index}`, ); }); diff --git a/tests/proxy.test.js b/tests/proxy.test.js index d7c73bc5b..0f1c65039 100644 --- a/tests/proxy.test.js +++ b/tests/proxy.test.js @@ -25,22 +25,29 @@ function validateProxiedRecords(t, data, file) { const recordTypes = Array.from(requiredRecordsToProxy).join(", "); if (data.proxied) { - const hasProxiedRecord = Object.keys(data.record).some((key) => requiredRecordsToProxy.has(key)); + const hasProxiedRecord = Object.keys(data.record).some((key) => + requiredRecordsToProxy.has(key), + ); t.true( hasProxiedRecord, - `${file}: Proxied is true but there are no records that can be proxied (${recordTypes} expected)` + `${file}: Proxied is true but there are no records that can be proxied (${recordTypes} expected)`, ); } } const domainsPath = path.resolve("domains"); -const files = fs.readdirSync(domainsPath).filter((file) => file.endsWith(".json")); +const files = fs + .readdirSync(domainsPath) + .filter((file) => file.endsWith(".json")); -t("Domains with proxy enabled must have at least one proxy-able record", (t) => { - files.forEach((file) => { - const domain = getDomainData(file); +t( + "Domains with proxy enabled must have at least one proxy-able record", + (t) => { + files.forEach((file) => { + const domain = getDomainData(file); - validateProxiedRecords(t, domain, file); - }); -}); + validateProxiedRecords(t, domain, file); + }); + }, +); diff --git a/tests/records.test.js b/tests/records.test.js index 223971308..9f05a650b 100644 --- a/tests/records.test.js +++ b/tests/records.test.js @@ -2,14 +2,29 @@ const t = require("ava"); const fs = require("fs-extra"); const path = require("path"); -const validRecordTypes = new Set(["A", "AAAA", "CAA", "CNAME", "DS", "MX", "NS", "SRV", "TXT", "URL"]); -const hostnameRegex = /^(?=.{1,253}$)(?:(?:[_a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)\.)+[a-zA-Z]{2,63}$/; -const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}$/; +const validRecordTypes = new Set([ + "A", + "AAAA", + "CAA", + "CNAME", + "DS", + "MX", + "NS", + "SRV", + "TXT", + "URL", +]); +const hostnameRegex = + /^(?=.{1,253}$)(?:(?:[_a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)\.)+[a-zA-Z]{2,63}$/; +const ipv4Regex = + /^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}$/; const ipv6Regex = /^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$|^::(?:[0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}$|^(?:[0-9a-fA-F]{1,4}:){1,7}:$|^(?:[0-9a-fA-F]{1,4}:){0,6}::(?:[0-9a-fA-F]{1,4}:){0,5}[0-9a-fA-F]{1,4}$/; const domainsPath = path.resolve("domains"); -const files = fs.readdirSync(domainsPath).filter((file) => file.endsWith(".json")); +const files = fs + .readdirSync(domainsPath) + .filter((file) => file.endsWith(".json")); const domainCache = {}; @@ -38,7 +53,7 @@ function expandIPv6(ip) { segments = [ ...nonEmptySegments.slice(0, emptyIndex), ...Array(missingSegments).fill("0000"), - ...nonEmptySegments.slice(emptyIndex) + ...nonEmptySegments.slice(emptyIndex), ]; } @@ -48,7 +63,11 @@ function expandIPv6(ip) { function validateIPv4(ip, proxied) { const parts = ip.split(".").map(Number); - if (parts.length !== 4 || parts.some((part) => isNaN(part) || part < 0 || part > 255)) return false; + if ( + parts.length !== 4 || + parts.some((part) => isNaN(part) || part < 0 || part > 255) + ) + return false; if (ip === "192.0.2.1" && proxied) return true; return !( @@ -94,100 +113,153 @@ function validateRecordValues(t, data, file) { Object.entries(data.record).forEach(([key, value]) => { // General validation for arrays if (["A", "AAAA", "MX", "NS"].includes(key)) { - t.true(Array.isArray(value), `${file}: Record value for ${key} should be an array`); + t.true( + Array.isArray(value), + `${file}: Record value for ${key} should be an array`, + ); value.forEach((record, idx) => { t.true( typeof record === "string", - `${file}: Record value for ${key} should be a string at index ${idx}` + `${file}: Record value for ${key} should be a string at index ${idx}`, ); if (key === "A") { - t.true(ipv4Regex.test(record), `${file}: Invalid IPv4 address for ${key} at index ${idx}`); + t.true( + ipv4Regex.test(record), + `${file}: Invalid IPv4 address for ${key} at index ${idx}`, + ); t.true( validateIPv4(record, data.proxied), - `${file}: Invalid IPv4 address for ${key} at index ${idx}` + `${file}: Invalid IPv4 address for ${key} at index ${idx}`, ); } else if (key === "AAAA") { const expandedIPv6 = expandIPv6(record); - t.true(ipv6Regex.test(expandedIPv6), `${file}: Invalid IPv6 address for ${key} at index ${idx}`); - t.true(validateIPv6(expandedIPv6), `${file}: Invalid IPv6 address for ${key} at index ${idx}`); + t.true( + ipv6Regex.test(expandedIPv6), + `${file}: Invalid IPv6 address for ${key} at index ${idx}`, + ); + t.true( + validateIPv6(expandedIPv6), + `${file}: Invalid IPv6 address for ${key} at index ${idx}`, + ); } else if (["MX", "NS"].includes(key)) { - t.true(isValidHostname(record), `${file}: Invalid hostname for ${key} at index ${idx}`); + t.true( + isValidHostname(record), + `${file}: Invalid hostname for ${key} at index ${idx}`, + ); } }); } // CNAME and URL validations if (["CNAME", "URL"].includes(key)) { - t.true(typeof value === "string", `${file}: Record value for ${key} should be a string`); + t.true( + typeof value === "string", + `${file}: Record value for ${key} should be a string`, + ); if (key === "CNAME") { - t.true(isValidHostname(value), `${file}: Invalid hostname for ${key}`); + t.true( + isValidHostname(value), + `${file}: Invalid hostname for ${key}`, + ); t.true(value !== file, `${file}: CNAME cannot point to itself`); } else if (key === "URL") { t.true( value.startsWith("http://") || value.startsWith("https://"), - `${file}: Record value for ${key} must start with http:// or https://` + `${file}: Record value for ${key} must start with http:// or https://`, + ); + t.notThrows( + () => new URL(value), + `${file}: Invalid URL for ${key}`, ); - t.notThrows(() => new URL(value), `${file}: Invalid URL for ${key}`); const urlHost = new URL(value).host; const isSelfReferencing = - file === "@.json" ? urlHost === "is-a.dev" : urlHost === `${subdomain}.is-a.dev`; + file === "@.json" + ? urlHost === "is-a.dev" + : urlHost === `${subdomain}.is-a.dev`; - t.true(!isSelfReferencing, `${file}: URL cannot point to itself`); + t.false( + isSelfReferencing, + `${file}: URL cannot point to itself`, + ); } } // CAA, DS, SRV validations if (["CAA", "DS", "SRV"].includes(key)) { - t.true(Array.isArray(value), `${file}: Record value for ${key} should be an array`); + t.true( + Array.isArray(value), + `${file}: Record value for ${key} should be an array`, + ); value.forEach((record, idx) => { t.true( typeof record === "object", - `${file}: Record value for ${key} should be an object at index ${idx}` + `${file}: Record value for ${key} should be an object at index ${idx}`, ); if (key === "CAA") { t.true( ["issue", "issuewild", "iodef"].includes(record.tag), - `${file}: Invalid tag for CAA at index ${idx}` + `${file}: Invalid tag for CAA at index ${idx}`, + ); + t.true( + typeof record.value === "string", + `${file}: Invalid value for CAA at index ${idx}`, ); - t.true(typeof record.value === "string", `${file}: Invalid value for CAA at index ${idx}`); t.true( isValidHostname(record.value) || record.value === ";", - `${file}: Value must be a hostname or semicolon for CAA at index ${idx}` + `${file}: Value must be a hostname or semicolon for CAA at index ${idx}`, ); } else if (key === "DS") { t.true( - Number.isInteger(record.key_tag) && record.key_tag >= 0 && record.key_tag <= 65535, - `${file}: Invalid key_tag for DS at index ${idx}` + Number.isInteger(record.key_tag) && + record.key_tag >= 0 && + record.key_tag <= 65535, + `${file}: Invalid key_tag for DS at index ${idx}`, ); t.true( - Number.isInteger(record.algorithm) && record.algorithm >= 0 && record.algorithm <= 255, - `${file}: Invalid algorithm for DS at index ${idx}` + Number.isInteger(record.algorithm) && + record.algorithm >= 0 && + record.algorithm <= 255, + `${file}: Invalid algorithm for DS at index ${idx}`, ); t.true( - Number.isInteger(record.digest_type) && record.digest_type >= 0 && record.digest_type <= 255, - `${file}: Invalid digest_type for DS at index ${idx}` + Number.isInteger(record.digest_type) && + record.digest_type >= 0 && + record.digest_type <= 255, + `${file}: Invalid digest_type for DS at index ${idx}`, + ); + t.true( + isValidHexadecimal(record.digest), + `${file}: Invalid digest for DS at index ${idx}`, ); - t.true(isValidHexadecimal(record.digest), `${file}: Invalid digest for DS at index ${idx}`); } else if (key === "SRV") { t.true( - Number.isInteger(record.priority) && record.priority >= 0 && record.priority <= 65535, - `${file}: Invalid priority for SRV at index ${idx}` + Number.isInteger(record.priority) && + record.priority >= 0 && + record.priority <= 65535, + `${file}: Invalid priority for SRV at index ${idx}`, ); t.true( - Number.isInteger(record.weight) && record.weight >= 0 && record.weight <= 65535, - `${file}: Invalid weight for SRV at index ${idx}` + Number.isInteger(record.weight) && + record.weight >= 0 && + record.weight <= 65535, + `${file}: Invalid weight for SRV at index ${idx}`, ); t.true( - Number.isInteger(record.port) && record.port >= 0 && record.port <= 65535, - `${file}: Invalid port for SRV at index ${idx}` + Number.isInteger(record.port) && + record.port >= 0 && + record.port <= 65535, + `${file}: Invalid port for SRV at index ${idx}`, + ); + t.true( + isValidHostname(record.target), + `${file}: Invalid target for SRV at index ${idx}`, ); - t.true(isValidHostname(record.target), `${file}: Invalid target for SRV at index ${idx}`); } }); } @@ -196,44 +268,60 @@ function validateRecordValues(t, data, file) { if (key === "TXT") { const values = Array.isArray(value) ? value : [value]; values.forEach((record, idx) => { - t.true(typeof record === "string", `${file}: TXT record value should be a string at index ${idx}`); + t.true( + typeof record === "string", + `${file}: TXT record value should be a string at index ${idx}`, + ); }); } }); if (data.redirect_config) { - const customPaths = Object.keys(data.redirect_config.custom_paths || {}); + const customPaths = Object.keys( + data.redirect_config.custom_paths || {}, + ); const pathRegex = /^\/[a-zA-Z0-9\-_\.\/]+(? { - const customRedirectURL = data.redirect_config.custom_paths[customPath]; + const customRedirectURL = + data.redirect_config.custom_paths[customPath]; const urlMessage = `${file}: Custom path in redirect_config`; // Validate the custom path t.true( pathRegex.test(customPath), - `${urlMessage} must start with a slash, contain only alphanumeric characters, hyphens, underscores, periods, and slashes, and cannot end with a slash at index ${idx}` + `${urlMessage} must start with a slash, contain only alphanumeric characters, hyphens, underscores, periods, and slashes, and cannot end with a slash at index ${idx}`, ); t.true( customPath.length >= 2 && customPath.length <= 255, - `${urlMessage} should be 2-255 characters long at index ${idx}` + `${urlMessage} should be 2-255 characters long at index ${idx}`, ); // Validate the redirect URL t.true( data.record.URL !== customRedirectURL, - `${urlMessage} should be different from the URL record at index ${idx}` + `${urlMessage} should be different from the URL record at index ${idx}`, ); t.true( - customRedirectURL.startsWith("http://") || customRedirectURL.startsWith("https://"), - `${urlMessage} must start with http:// or https:// at index ${idx}` + customRedirectURL.startsWith("http://") || + customRedirectURL.startsWith("https://"), + `${urlMessage} must start with http:// or https:// at index ${idx}`, + ); + t.notThrows( + () => new URL(customRedirectURL), + `${urlMessage} contains an invalid URL at index ${idx}`, ); - t.notThrows(() => new URL(customRedirectURL), `${urlMessage} contains an invalid URL at index ${idx}`); // Check for self-referencing redirects const urlHost = new URL(customRedirectURL).host; - const isSelfReferencing = file === "@.json" ? urlHost === "is-a.dev" : urlHost === `${subdomain}.is-a.dev`; - t.true(!isSelfReferencing, `${urlMessage} cannot point to itself at index ${idx}`); + const isSelfReferencing = + file === "@.json" + ? urlHost === "is-a.dev" + : urlHost === `${subdomain}.is-a.dev`; + t.false( + isSelfReferencing, + `${urlMessage} cannot point to itself at index ${idx}`, + ); }); } } @@ -244,35 +332,51 @@ t("All files should have valid record types", (t) => { const recordKeys = Object.keys(data.record); recordKeys.forEach((key) => { - t.true(validateRecordType(key), `${file}: Invalid record type: ${key}`); + t.true( + validateRecordType(key), + `${file}: Invalid record type: ${key}`, + ); }); // Record type combinations validation if (recordKeys.includes("CNAME") && !data.proxied) { - t.is(recordKeys.length, 1, `${file}: CNAME records cannot be combined with other records unless proxied`); + t.is( + recordKeys.length, + 1, + `${file}: CNAME records cannot be combined with other records unless proxied`, + ); } if (recordKeys.includes("NS")) { t.true( - recordKeys.length === 1 || (recordKeys.length === 2 && recordKeys.includes("DS")), - `${file}: NS records cannot be combined with other records, except for DS records` + recordKeys.length === 1 || + (recordKeys.length === 2 && recordKeys.includes("DS")), + `${file}: NS records cannot be combined with other records, except for DS records`, ); } if (recordKeys.includes("DS")) { - t.true(recordKeys.includes("NS"), `${file}: DS records must be combined with NS records`); + t.true( + recordKeys.includes("NS"), + `${file}: DS records must be combined with NS records`, + ); } if (recordKeys.includes("URL")) { t.true( - !recordKeys.includes("A") && !recordKeys.includes("AAAA") && !recordKeys.includes("CNAME"), - `${file}: URL records cannot be combined with A, AAAA, or CNAME records` + !recordKeys.includes("A") && + !recordKeys.includes("AAAA") && + !recordKeys.includes("CNAME"), + `${file}: URL records cannot be combined with A, AAAA, or CNAME records`, ); } if (data.redirect_config) { t.true( recordKeys.includes("URL") || data.proxied, - `${file}: Redirect config must be combined with a URL record or the domain must be proxied` + `${file}: Redirect config must be combined with a URL record or the domain must be proxied`, ); if (data.redirect_config.redirect_paths) { - t.true(recordKeys.includes("URL"), `${file}: redirect_config.redirect_paths requires a URL record`); + t.true( + recordKeys.includes("URL"), + `${file}: redirect_config.redirect_paths requires a URL record`, + ); } } diff --git a/tests/special.test.js b/tests/special.test.js index bd18e3e00..3a5f8aeef 100644 --- a/tests/special.test.js +++ b/tests/special.test.js @@ -3,16 +3,24 @@ const fs = require("fs-extra"); const path = require("path"); const domainsPath = path.resolve("domains"); -const files = fs.readdirSync(domainsPath).filter((file) => file.endsWith(".json")); +const files = fs + .readdirSync(domainsPath) + .filter((file) => file.endsWith(".json")); -const bypassedUsernames = require("../util/bypassed.json").map((username) => username.toLowerCase()); +const bypassedUsernames = require("../util/bypassed.json").map((username) => + username.toLowerCase(), +); function getDomainData(subdomain) { try { - const data = fs.readJsonSync(path.join(domainsPath, `${subdomain}.json`)); + const data = fs.readJsonSync( + path.join(domainsPath, `${subdomain}.json`), + ); return data; } catch (error) { - throw new Error(`Failed to read JSON for ${subdomain}: ${error.message}`); + throw new Error( + `Failed to read JSON for ${subdomain}: ${error.message}`, + ); } } @@ -23,15 +31,20 @@ t("Users are limited to one single character subdomain", (t) => { const subdomain = file.replace(/\.json$/, ""); const data = getDomainData(subdomain); - if (subdomain.length === 1 && !bypassedUsernames.includes(data.owner.username.toLowerCase())) { + if ( + subdomain.length === 1 && + !bypassedUsernames.includes(data.owner.username.toLowerCase()) + ) { results.push({ subdomain, - owner: data.owner.username.toLowerCase() + owner: data.owner.username.toLowerCase(), }); } }); - const duplicates = results.filter((result) => results.filter((r) => r.owner === result.owner).length > 1); + const duplicates = results.filter( + (result) => results.filter((r) => r.owner === result.owner).length > 1, + ); const output = duplicates.reduce((acc, curr) => { if (!acc[curr.owner]) { acc[curr.owner] = []; @@ -46,7 +59,7 @@ t("Users are limited to one single character subdomain", (t) => { 0, Object.keys(output) .map((owner) => `${owner} - ${output[owner].join(", ")}`) - .join("\n") + .join("\n"), ); t.pass(); diff --git a/util/bypassed.json b/util/bypassed.json index ed9a583ce..31fe6be0d 100644 --- a/util/bypassed.json +++ b/util/bypassed.json @@ -1,4 +1 @@ -[ - "is-a-dev", - "wdhdev" -] +["is-a-dev", "wdhdev"] diff --git a/util/reserved.json b/util/reserved.json index 0963a84a4..4482ced8e 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -1,4 +1,8 @@ [ + "_acme-challenge.www", + "_atproto.www", + "_discord.www", + "_vercel.www", "account", "accounts", "admin", diff --git a/util/wildcards.json b/util/wildcards.json deleted file mode 100644 index 2de23327b..000000000 --- a/util/wildcards.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "*.william" -]