diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 9fc9d34de..1c5f7d0ca 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -11,6 +11,6 @@ jobs: fetch-depth: 0 - uses: oven-sh/setup-bun@v1 with: - bun-version: 1.0.0 + bun-version: 1.0.3 - run: bun install - run: bun test diff --git a/.github/workflows/publish-records.yml b/.github/workflows/publish-records.yml index 7a0ab3e06..522179f4d 100644 --- a/.github/workflows/publish-records.yml +++ b/.github/workflows/publish-records.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - uses: oven-sh/setup-bun@v1 with: - bun-version: 1.0.0 + bun-version: 1.0.3 - run: bun install - run: bun test - name: Publishing records diff --git a/bun.lockb b/bun.lockb index f6fab3304..502212010 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/domains/1024.json b/domains/1024.json new file mode 100644 index 000000000..d2301f533 --- /dev/null +++ b/domains/1024.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "cy920820", + "email": "cuiyang673308817@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/abhishekpanda.json b/domains/abhishekpanda.json new file mode 100644 index 000000000..d9f28916f --- /dev/null +++ b/domains/abhishekpanda.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "goesbyabhi", + "email": "abxisxekpanda@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/ayaan.json b/domains/ayaan.json new file mode 100644 index 000000000..c059fac4c --- /dev/null +++ b/domains/ayaan.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "dexjr", + "email": "dexjrdexjr@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/bampa.json b/domains/bampa.json new file mode 100644 index 000000000..f1d92badb --- /dev/null +++ b/domains/bampa.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "bampenes", + "email": "rafinhabampa@hotmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/cha0tic.json b/domains/cha0tic.json new file mode 100644 index 000000000..ed013d614 --- /dev/null +++ b/domains/cha0tic.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "cha0ticcoder", + "email": "chaoticplayern1@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/chandrabose.json b/domains/chandrabose.json new file mode 100644 index 000000000..39ffd69d3 --- /dev/null +++ b/domains/chandrabose.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "chandrabosep", + "email": "chandrabosep3112@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/hkamran.json b/domains/hkamran.json new file mode 100644 index 000000000..3710123e0 --- /dev/null +++ b/domains/hkamran.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "hkamran80", + "email": "hkamran@hkamran.com" + }, + "record": { + "URL": "https://hkamran.com/?ref=isadev" + } +} diff --git a/domains/itsdemongamez.json b/domains/itsdemongamez.json index de9479e59..8dbd2ff9f 100644 --- a/domains/itsdemongamez.json +++ b/domains/itsdemongamez.json @@ -1,11 +1,11 @@ { "owner": { - "username": "ShadowPlayzYT22", - "email": "peterwyneg@gmail.com" + "username": "DemonGamez", + "email": "peterwyneg@gmail.com", + "discord": "1038747272701292584" }, + "record": { - "A": ["217.174.245.249"], - "MX": ["hosts.is-a.dev"], - "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + "CNAME": "DemonGamez.github.io" } -} \ No newline at end of file +} diff --git a/domains/jamez.json b/domains/jamez.json new file mode 100644 index 000000000..c392e4547 --- /dev/null +++ b/domains/jamez.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "jamesisacutedog", + "email": "jamezemailreal@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/kasun.json b/domains/kasun.json index 5357adba1..399897a55 100644 --- a/domains/kasun.json +++ b/domains/kasun.json @@ -4,8 +4,6 @@ "email": "givemelognotes@gmail.com" }, "record": { - "A": ["217.174.245.249"], - "MX": ["hosts.is-a.dev"], - "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" - } -} \ No newline at end of file + "URL": "https://ka0un.github.io" + } +} diff --git a/domains/lenn106.json b/domains/lenn106.json new file mode 100644 index 000000000..5436a8c28 --- /dev/null +++ b/domains/lenn106.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "Lenn106", + "email": "lennongreyson@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/mohab.json b/domains/mohab.json new file mode 100644 index 000000000..01b5231c3 --- /dev/null +++ b/domains/mohab.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "Zyelixify", + "email": "heroxmain@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/mrj.json b/domains/mrj.json index a4d0a1fee..f3e362dd2 100644 --- a/domains/mrj.json +++ b/domains/mrj.json @@ -4,6 +4,8 @@ "email": "illegalhacker2.0@gmail.com" }, "record": { - "CNAME": "glitch.edgeapp.net" + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" } } diff --git a/domains/nixxvl.json b/domains/nixxvl.json new file mode 100644 index 000000000..d1b4d3d3c --- /dev/null +++ b/domains/nixxvl.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "nixxvl", + "email": "noyboyroblox@gmail.com" + }, + "record": { + "CNAME": "nixxvl.space" + } +} diff --git a/domains/renata.json b/domains/renata.json new file mode 100644 index 000000000..57db3a46a --- /dev/null +++ b/domains/renata.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "xrenata", + "email": "emirhan@duck.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/selenite.json b/domains/selenite.json new file mode 100644 index 000000000..1943cc900 --- /dev/null +++ b/domains/selenite.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "skysthelimitt", + "email": "skysth3limit@pm.me" + }, + "record": { + "CNAME": "selenite.pages.dev" + } +} diff --git a/domains/sharan.json b/domains/sharan.json new file mode 100644 index 000000000..a987bb6e0 --- /dev/null +++ b/domains/sharan.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "sharan-218", + "email": "yenugulasharan8019@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/shing.json b/domains/shing.json new file mode 100644 index 000000000..d2a324827 --- /dev/null +++ b/domains/shing.json @@ -0,0 +1,10 @@ +{ + "owner": { + "username": "ShingSemicolon", + "email": "Shing.XD.0602@gmail.com" + }, + "record": { + "A": ["129.80.190.178"], + "AAAA": ["2603:c020:400d:3e89:2d5a:b8a3:1999:49f"] + } +} diff --git a/domains/siddharthtewari.json b/domains/siddharthtewari.json new file mode 100644 index 000000000..fe5dbf434 --- /dev/null +++ b/domains/siddharthtewari.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "sid-008", + "email": "siddharthtewari14@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/tanish.json b/domains/tanish.json new file mode 100644 index 000000000..81737f663 --- /dev/null +++ b/domains/tanish.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "hirakotm", + "email": "hirakoo@proton.me" + }, + "record": { + "CNAME": "hirako-is-really-cool.pages.dev" + } +} diff --git a/domains/tazmyan.json b/domains/tazmyan.json new file mode 100644 index 000000000..b654817b3 --- /dev/null +++ b/domains/tazmyan.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "Tazmyan", + "email": "tikpatka@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/zhougonglai.json b/domains/zhougonglai.json new file mode 100644 index 000000000..48663a97c --- /dev/null +++ b/domains/zhougonglai.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "zhougonglai", + "email": "838048635@qq.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/domains/zye.json b/domains/zye.json new file mode 100644 index 000000000..01b5231c3 --- /dev/null +++ b/domains/zye.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "Zyelixify", + "email": "heroxmain@gmail.com" + }, + "record": { + "A": ["217.174.245.249"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} \ No newline at end of file diff --git a/package.json b/package.json index 587307bab..ccc8dbd41 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "author": "Akshay Nair ", "license": "GPL-3.0", "dependencies": { + "ip-regex": "^5.0.0", "ramda": "^0.27.1" }, "devDependencies": { diff --git a/tests/validations.test.js b/tests/validations.test.js index 219546bad..a07ccf6fa 100644 --- a/tests/validations.test.js +++ b/tests/validations.test.js @@ -59,6 +59,11 @@ describe('validateDomainData', () => { { ...defaultDomain, name: 'help.baa' }, { ...defaultDomain, name: '_github-pages-challenge-is-a-dev' }, { ...defaultDomain, name: '_github-challenge-is-a-dev' }, + { ...defaultDomain, record: { AAAA: [] } }, + { ...defaultDomain, record: { AAAA: ['182.22.222.22', '::1'] } }, + { ...defaultDomain, record: { AAAA: '182.22.222.22' } }, + { ...defaultDomain, record: { A: '::1' } }, + { ...defaultDomain, name: '_discord' }, ]; const validCases = [ @@ -86,6 +91,9 @@ describe('validateDomainData', () => { { ...defaultDomain, name: '_github-challenge-hello01-ga' }, { ...defaultDomain, name: '_github-challenge-hello01_ga' }, { ...defaultDomain, record: { TXT: ['foobar wow nice!!!', 'more text'] } }, + { ...defaultDomain, record: { AAAA: ['::1', '2001:db8:3333:4444:5555:6666:7777:8888'] } }, + { ...defaultDomain, record: { A: ['122.222.222.222'] } }, + { ...defaultDomain, name: '_discord.subdomain' }, ]; it('should return false for invalid data', () => { diff --git a/utils/constants.js b/utils/constants.js index 273a2761e..19430e5bf 100644 --- a/utils/constants.js +++ b/utils/constants.js @@ -18,7 +18,7 @@ const DOMAINS_PATH = path.resolve('domains'); module.exports = { ENV, IS_TEST, - VALID_RECORD_TYPES: ['CNAME', 'A', 'URL', 'MX', 'TXT'], + VALID_RECORD_TYPES: ['CNAME', 'A', 'URL', 'MX', 'TXT', 'AAAA'], DOMAIN_DOMAIN: DOMAIN_DOMAIN || 'booboo.xyz', DOMAIN_USER: IS_TEST ? 'testuser' : DOMAIN_USER, DOMAIN_API_KEY: IS_TEST ? 'testkey' : DOMAIN_API_KEY, diff --git a/utils/invalid-domains.json b/utils/invalid-domains.json index a8943f3c4..ef66a5517 100644 --- a/utils/invalid-domains.json +++ b/utils/invalid-domains.json @@ -14,5 +14,6 @@ "ww3", "ww4", "wwww", - "your-domain-name" + "your-domain-name", + "_discord" ] diff --git a/utils/validations.js b/utils/validations.js index 9a99343fa..b9c851a19 100644 --- a/utils/validations.js +++ b/utils/validations.js @@ -2,6 +2,8 @@ const R = require('ramda'); const { VALID_RECORD_TYPES } = require('./constants'); const { or, and, validate, between, testRegex, withLengthEq, withLengthGte } = require('./helpers'); const INVALID_NAMES = require('./invalid-domains.json'); +const ipRegex_ = require('ip-regex'); +const ipRegex = ipRegex_.default ?? ipRegex_; const isValidURL = and([R.is(String), testRegex(/^https?:\/\//ig)]); @@ -17,6 +19,7 @@ const validateCnameRecord = type => and([ const validateARecord = type => and([ R.propIs(Array, type), R.propSatisfies(withLengthGte(1), type), + R.all(testRegex(ipRegex.v4({ exact: true }))), ]); const validateMXRecord = type => and([ @@ -25,8 +28,19 @@ const validateMXRecord = type => and([ R.propSatisfies(R.all(isValidDomain), type), ]); +const validateAAAARecord = R.propSatisfies(and([ + R.is(Array), + withLengthGte(1), + R.all(testRegex(ipRegex.v6({ exact: true }))), +])) + const checkRestrictedNames = R.complement(R.includes(R.__, INVALID_NAMES)) +const extraSupportedNames = [ + testRegex(/^_github(-pages)?-challenge-[a-z0-9-_]+$/i), // Exception for github verification records + R.equals('_discord'), +] + const validateDomainData = validate({ name: { reason: 'The name of the file is invalid. It must be lowercased, alphanumeric and each component must be more than 2 characters long', @@ -34,17 +48,15 @@ const validateDomainData = validate({ R.equals('@'), and([ R.is(String), + checkRestrictedNames, R.compose( R.all(or([ - and([ - testRegex(/^_github(-pages)?-challenge-[a-z0-9-_]+$/i), // Exception for github verification records - checkRestrictedNames, - ]), and([ R.compose(between(2, 100), R.length), testRegex(/^[a-z0-9-]+$/g), checkRestrictedNames, - ]) + ]), + ...extraSupportedNames, ])), R.split('.'), ), @@ -75,6 +87,7 @@ const validateDomainData = validate({ [R.has('URL'), R.propSatisfies(isValidURL, 'URL')], [R.has('MX'), validateMXRecord('MX')], [R.has('TXT'), R.propSatisfies(or([ R.is(String), R.is(Array) ]), 'TXT')], + [R.has('AAAA'), validateAAAARecord('AAAA')], [R.T, R.T], ]), ]),