feat: disable domain if DNS records not found (NXDOMAIN) (#748)

un · Aug 27, 2024 · fb32c17 · fb32c17
1 parent 36316c6
commit fb32c17
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/apps/mail-bridge/postal-db/functions.ts b/apps/mail-bridge/postal-db/functions.ts
@@ -167,7 +167,7 @@ export type GetDomainDNSRecordsOutput =
         acceptable: string;
       };
     }
-  | { error: string };
+  | { error: string; errorCode: number };
 
 export async function getDomainDNSRecords(
   domainId: string,
@@ -179,7 +179,7 @@ export async function getDomainDNSRecords(
   });
 
   if (!domainInfo) {
-    return { error: 'Domain not found, Contact Support' };
+    return { error: 'Domain not found, Contact Support', errorCode: 3 };
   }
 
   const records: GetDomainDNSRecordsOutput = {
@@ -222,7 +222,8 @@ export async function getDomainDNSRecords(
 
   if (txtRecords.success === false && txtRecords.code !== 0) {
     return {
-      error: `${txtRecords.error} Please retry after sometime, if the problem persists contact Support`
+      error: `${txtRecords.error} Please retry after sometime, if the problem persists contact Support`,
+      errorCode: txtRecords.code
     };
   }
 

diff --git a/apps/platform/utils/updateDnsRecords.ts b/apps/platform/utils/updateDnsRecords.ts
@@ -95,6 +95,17 @@ export async function updateDnsRecords(
     });
 
   if ('error' in currentDNSRecords) {
+    if (currentDNSRecords.errorCode === 3) {
+      // Domain does not exist, disable the domain
+      await db
+        .update(domains)
+        .set({
+          disabled: true,
+          disabledAt: new Date(),
+          lastDnsCheckAt: new Date()
+        })
+        .where(eq(domains.id, domainResponse.id));
+    }
     throw new TRPCError({
       code: 'INTERNAL_SERVER_ERROR',
       message: currentDNSRecords.error

diff --git a/apps/worker/services/dns-check-queue.ts b/apps/worker/services/dns-check-queue.ts
@@ -1,7 +1,9 @@
 import { createQueue, createWorker } from '../utils/queue-helpers';
 import { checkDns } from '../functions/check-dns';
 import type { TypeId } from '@u22n/utils/typeid';
+import { domains } from '@u22n/database/schema';
 import { discord } from '@u22n/utils/discord';
+import { eq } from '@u22n/database/orm';
 import { db } from '@u22n/database';
 import { CronJob } from 'cron';
 
@@ -33,6 +35,7 @@ export async function addImmediateDnsCheckJob(
 export const masterCronJob = new CronJob('0 6,14,22 * * *', async () => {
   await discord.info('Running Daily DNS Cron Job');
   const activeDomains = await db.query.domains.findMany({
+    where: eq(domains.disabled, false),
     columns: { publicId: true }
   });
   await dnsCheckQueue.addBulk(