Skip to content

fix: normalize domains to ensure FQDN equality #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
addaleax merged 5 commits into from
Dec 4, 2025
Merged

fix: normalize domains to ensure FQDN equality #6

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09c55d7
fix: normalize domains to ensure FQDN equality
tkxkd0159 Nov 20, 2025
e9d667f
fix lint
tkxkd0159 Nov 25, 2025
0cc4b97
Apply feedback
tkxkd0159 Nov 25, 2025
aa6a5b3
add test
tkxkd0159 Nov 25, 2025
9d75f04
add await for asynchronous assertions
tkxkd0159 Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

function matchesParentDomain (srvAddress: string, parentDomain: string): boolean {
const regex = /^.*?\./;
const srv = `.${srvAddress.replace(regex, '')}`;
const parent = `.${parentDomain.replace(regex, '')}`;
const srv = `.${(srvAddress.endsWith(".") ? srvAddress.slice(0, -1) : srvAddress).replace(regex, "")}`;

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 12.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 12.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 14.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 14.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (macos-latest, 16.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (macos-latest, 16.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 16.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 16.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 16.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 16.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 14.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 14.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 12.x) 

Strings must use singlequote

Check failure on line 18 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 12.x) 

Strings must use singlequote
const parent = `.${(parentDomain.endsWith(".") ? parentDomain.slice(0, -1) : parentDomain).replace(regex, "")}`;

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 12.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 12.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 14.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 14.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (macos-latest, 16.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (macos-latest, 16.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 16.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 16.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 16.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 16.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 14.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 14.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 12.x) 

Strings must use singlequote

Check failure on line 19 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 12.x) 

Strings must use singlequote
return srv.endsWith(parent);
}

Expand All @@ -39,7 +39,7 @@
let records: string[][] | undefined;
try {
records = await promisify(dns.resolveTxt)(lookupAddress);
} catch (err: any) {

Check warning on line 42 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 12.x) 

Unexpected any. Specify a different type

Check warning on line 42 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 14.x) 

Unexpected any. Specify a different type

Check warning on line 42 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (macos-latest, 16.x) 

Unexpected any. Specify a different type

Check warning on line 42 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest, 16.x) 

Unexpected any. Specify a different type

Check warning on line 42 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 16.x) 

Unexpected any. Specify a different type

Check warning on line 42 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 14.x) 

Unexpected any. Specify a different type

Check warning on line 42 in src/index.ts

View workflow job for this annotation

GitHub Actions / Test (windows-latest, 12.x) 

Unexpected any. Specify a different type
if (err?.code && (err.code !== 'ENODATA' && err.code !== 'ENOTFOUND')) {
throw err;
}
Expand Down
Loading