updated: check for wildcard only if many returned

LayeredStudio · Feb 1, 2024 · 91943f1 · 91943f1
1 parent fbf5257
commit 91943f1
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -7,3 +7,4 @@ export type GetAllDnsRecordsOptions = {
 export declare function getAllDnsRecordsStream(domain: string, options?: Partial<GetAllDnsRecordsOptions>): ReadableStream;
 export declare function getAllDnsRecords(domain: string, options?: Partial<GetAllDnsRecordsOptions>): Promise<DnsRecord[]>;
 export declare function parseDnsRecord(record: string | Uint8Array): DnsRecord;
+export declare function detectWildcardRecords(domain: string, records: DnsRecord[], percent?: number): DnsRecord[];
diff --git a/dist/index.js b/dist/index.js
@@ -190,20 +190,17 @@ export async function getAllDnsRecords(domain, options = {}) {
     const records = [];
     const dnsRecordsStream = getAllDnsRecordsStream(domain, options);
     const reader = dnsRecordsStream.getReader();
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
         const read = () => {
             reader.read().then(({ done, value }) => {
                 if (done) {
-                    //todo detect wildcards
-                    resolve(records);
+                    resolve(detectWildcardRecords(domain, records));
                 }
                 else {
                     records.push(parseDnsRecord(value));
                     read();
                 }
-            }).catch(error => {
-                console.error('dns err', error);
-            });
+            }).catch(reject);
         };
         read();
     });
@@ -223,3 +220,36 @@ export function parseDnsRecord(record) {
         data: String(parts[4]),
     };
 }
+export function detectWildcardRecords(domain, records, percent = 0.15) {
+    const sameDataGroup = {};
+    const wildcardsFound = [];
+    records.forEach(record => {
+        if (['A', 'AAAA', 'CNAME'].includes(record.type)) {
+            const key = `${record.type}-${record.data}`;
+            sameDataGroup[key] ||= 0;
+            sameDataGroup[key]++;
+        }
+    });
+    const recordsWithWildcard = [];
+    records.forEach(record => {
+        if (['A', 'AAAA', 'CNAME'].includes(record.type)) {
+            const key = `${record.type}-${record.data}`;
+            const sameData = sameDataGroup[key] || 0;
+            const recordTypeLength = records.filter(r => r.type === record.type).length;
+            if (sameData / recordTypeLength < percent || recordTypeLength < subdomainsRecords.length / 2) {
+                recordsWithWildcard.push(record);
+            }
+            else if (!wildcardsFound.includes(key)) {
+                wildcardsFound.push(key);
+                recordsWithWildcard.push({
+                    ...record,
+                    name: `*.${domain}`,
+                });
+            }
+        }
+        else {
+            recordsWithWildcard.push(record);
+        }
+    });
+    return recordsWithWildcard;
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@layered/dns-records",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.8",
   "description": "Discover publicly available DNS Records for a domain",
   "type": "module",
   "keywords": [

diff --git a/src/index.ts b/src/index.ts
@@ -292,8 +292,9 @@ export function detectWildcardRecords(domain: string, records: DnsRecord[], perc
 		if (['A', 'AAAA', 'CNAME'].includes(record.type)) {
 			const key = `${record.type}-${record.data}`
 			const sameData = sameDataGroup[key] || 0
+			const recordTypeLength = records.filter(r => r.type === record.type).length
 
-			if (sameData / records.filter(r => r.type === record.type).length < percent) {
+			if (sameData / recordTypeLength < percent || recordTypeLength < subdomainsRecords.length / 2) {
 				recordsWithWildcard.push(record)
 			} else if (!wildcardsFound.includes(key)) {
 				wildcardsFound.push(key)