@social-mail/social-mail-web-server 1.4.989 → 1.4.992

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.989",
+  "version": "1.4.992",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/common/StringFormat.ts

@@ -0,0 +1,12 @@
+export default class StringFormat {
+
+    static fixed(n: number, max = 2) {
+        const t = n.toString();
+        const pad = max - t.length;
+        if (pad > 0) {
+            return t.padStart(pad, "0");
+        }
+        return t;
+    }
+
+}

package/src/common/globalEnv.ts

@@ -27,7 +27,7 @@ export const globalEnv = {
     externalLogin: process.env.SOCIAL_MAIL_EXTERNAL_LOGIN,
     dns: {
         enabled: /^(true|yes)$/i.test(process.env.SOCIAL_MAIL_DNS_ENABLED),
-        soa: process.env.SOCIAL_MAIL_DNS_SOA || "somewhere somewhere.com",
+        soa: (process.env.SOCIAL_MAIL_DNS_SOA || "admin.socialmail.in somewhere.com").split(/[\s\,\;]/g).map((txt: string) => txt.endsWith(".") ? txt : txt + "."),
         letsEncryptPrefix: process.env.SOCIAL_MAIL_DNS_LE_PREFIX
     },
     altHosts: (process.env.SOCIAL_MAIL_ALT_HOSTS || "").split(","),

package/src/server/model/events/HostedZoneEvents.ts

@@ -40,91 +40,8 @@ export default class HostedZoneEvents extends AuthenticatedEvents<HostedZone> {
     }
 
     async afterInsert(entity: HostedZone, entry: ChangeEntry<HostedZone>) {
-
-
-        await entry.loadNavigationAsync((x) => x.domain);
-
-        const { zoneID, domain: { name: domain } } = entity;
-
-        const dateCreated = DateTime.now;
-        const dateUpdated = dateCreated;
-
-        // add some default records...
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-
-        const ttl = 8600;
-
-        await db.hostedZoneRecords.statements.insert({
-            zoneID,
-            dateCreated,
-            dateUpdated,
-            ttl,
-            name: "@",
-            type: "SOA",
-            value: globalEnv.dns.soa,
-            readonly: true,
-        });
-
-        await db.hostedZoneRecords.statements.insert({
-            zoneID,
-            dateCreated,
-            dateUpdated,
-            ttl,
-            name: "_acme-challenge",
-            type: "CNAME",
-            value: `${domain}.${globalEnv.dns.letsEncryptPrefix}`,
-            readonly: true,
-        });
-
-        await db.hostedZoneRecords.statements.insert({
-            zoneID,
-            dateCreated,
-            dateUpdated,
-            ttl,
-            name: "_dmarc",
-            type: "TXT",
-            value: `v=DMARC1; p=reject; rua=mailto:no-reply@${domain};`,
-            readonly: true,
-        });
-
-        await db.hostedZoneRecords.statements.insert({
-            zoneID,
-            dateCreated,
-            dateUpdated,
-            ttl,
-            type: "A",
-            name: "@",
-            value: "$IP$",
-            fqdn: `${domain}`,
-            readonly: true
-        });
-
-        await db.hostedZoneRecords.statements.insert({
-            zoneID,
-            dateCreated,
-            dateUpdated,
-            ttl,
-            type: "CNAME",
-            name: "www",
-            value: "$HOST$",
-            fqdn: `www.${domain}`,
-            readonly: true
-        });
-
-        await db.hostedZoneRecords.statements.insert({
-            zoneID,
-            dateCreated,
-            dateUpdated,
-            ttl,
-            type: "CNAME",
-            name: "*",
-            value: "$HOST$",
-            fqdn: `*.${domain}`,
-            readonly: true
-        });
-
         const wc = ServiceProvider.resolve(this, WorkflowContext);
-        await SyncDnsZoneRecordsWorkflow.enqueue(wc, zoneID);
+        await SyncDnsZoneRecordsWorkflow.enqueue(wc, entity.zoneID);
     }
 
 }

package/src/server/workflows/dns/SyncDnsZoneRecordsWorkflow.ts

@@ -7,6 +7,10 @@ import EmailAddressService from "../../services/EmailAddressService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import GlobalEvents from "../../../common/GlobalEvents.js";
+import StringFormat from "../../../common/StringFormat.js";
+
+const toUnixDateAndHour = (date: Date | DateTime, d = DateTime.from(date)) =>
+    `${StringFormat.fixed(d.year, 4)}${StringFormat.fixed(d.month)}${StringFormat.fixed(d.day)}${StringFormat.fixed(d.hour)}`;
 
 export default class SyncDnsZoneRecordsWorkflow extends Workflow {
 
@@ -67,10 +71,17 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             ttl,
             name: "@",
             type: "SOA",
-            value: globalEnv.dns.soa,
+            value: globalEnv.dns.soa.join(" ") + `( 
+                                        ${toUnixDateAndHour(dateCreated)}
+                                        28000
+                                        7200
+                                        604800
+                                        600
+                                    )`,
             readonly: true,
         });
 
+
         await db.hostedZoneRecords.statements.insert({
             zoneID,
             dateCreated,