@social-mail/social-mail-web-server 1.4.974 → 1.4.976

package/package.json

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

package/src/common/globalEnv.ts

@@ -24,7 +24,11 @@ export const globalEnv = {
     cdn: process.env.SOCIAL_MAIL_CDN,
     path: process.env.SOCIAL_MAIL_PATH || "/",
     externalLogin: process.env.SOCIAL_MAIL_EXTERNAL_LOGIN,
-    dnsEnabled: /^(true|yes)$/i.test(process.env.SOCIAL_MAIL_DNS_ENABLED),
+    dns: {
+        enabled: /^(true|yes)$/i.test(process.env.SOCIAL_MAIL_DNS_ENABLED),
+        soa: process.env.SOCIAL_MAIL_DNS_SOA || "somewhere somewhere.com",
+        letsEncryptPrefix: process.env.SOCIAL_MAIL_DNS_LE_PREFIX
+    },
     altHosts: (process.env.SOCIAL_MAIL_ALT_HOSTS || "").split(","),
     wildcardDomain: process.env.SOCIAL_MAIL_WILDCARD_DOMAIN,
     name: process.env.SOCIAL_MAIL_NAME || "Social Mail",

package/src/server/model/entities/HostedZone.ts

@@ -72,6 +72,9 @@ export class HostedZoneRecord {
     @Column({ dataType: "Boolean", default: () => false})
     public disabled: boolean;
 
+    @Column({ dataType: "Boolean", default: () => false})
+    public readonly: boolean;
+
     @Column({ dataType: "Char", length: 200})
     public name: string;
 
@@ -97,12 +100,12 @@ export class HostedZoneRecord {
     @Column({ dataType: "Char", nullable: true})
     public notes: string;
 
-    @Column({ dataType: "Char", nullable: true})
-    public signature: string;
-
     @Column({ nullable: true })
     public expiryDate: DateTime;
 
+    @Column({ dataType: "Boolean", default: () => false})
+    public hosted: boolean;
+
     @Column({ nullable: true})
     @ReadOnlyJsonProperty
     public fqdn: string;

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

@@ -5,6 +5,8 @@ import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeE
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../SocialMailContext.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import { globalEnv } from "../../../common/globalEnv.js";
 
 export default class HostedZoneEvents extends AuthenticatedEvents<HostedZone> {
 
@@ -18,6 +20,92 @@ export default class HostedZoneEvents extends AuthenticatedEvents<HostedZone> {
         return query.where(this.sessionUser, (p) => (x) => x.users.some((u) => u.userID === p.userID));
     }
 
+    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
+        });
+
+    }
+
 }
 
 export class HostedZoneRecordEvents extends AuthenticatedEvents<HostedZoneRecord> {
@@ -32,6 +120,13 @@ export class HostedZoneRecordEvents extends AuthenticatedEvents<HostedZoneRecord
         return query.where(this.sessionUser, (p) => (x) => x.zone.users.some((u) => u.userID === p.userID));
     }
 
+    modify(query: IEntityQuery<HostedZoneRecord>) {
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
+        return query.where(void 0, (p) => (x) => x.readonly === false);
+    }
+
     async afterInsert(entity: HostedZoneRecord, entry: ChangeEntry<HostedZoneRecord>) {
         const db = ServiceProvider.resolve(this, SocialMailContext);
         const prefix = (!entity.name || entity.name === "@") ? "" : entity.name + ".";

package/src/server/services/ui/renderUIClient.tsx

@@ -43,7 +43,7 @@ export const renderUIClient = async (page: Page, view?: string ) => {
                     name: globalEnv.name,
                     cdn: globalEnv.cdn,
                     externalLogin: globalEnv.externalLogin,
-                    dnsEnabled: globalEnv.dnsEnabled
+                    dnsEnabled: globalEnv.dns?.enabled
                 })};
             </script>
             <link rel="manifest" href="/pwa/manifest.json"/>