pmcf 1.81.0 → 1.82.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.81.0",
+  "version": "1.82.0",
   "publishConfig": {
     "access": "public"
   },

package/src/dns-utils.mjs

@@ -5,7 +5,11 @@ export function dnsFullName(name) {
 }
 
 export function DNSRecord(key, type, ...values) {
-  values = values.map(v => (typeof v === "number" ? String(v).padStart(3) : v));
+  const pad = type === "MX" ? "        " : "";
+
+  values = values.map(v =>
+    typeof v === "number" ? String(v).padStart(3) + pad : v
+  );
 
   return {
     key,
@@ -23,7 +27,8 @@ export function dnsFormatParameters(parameters) {
       value !== undefined && [...asIterator(value)].length > 0
         ? `${name}="${[...asIterator(value)].join(",")}"`
         : name
-    ).sort((a,b)=>a[0].localeCompare(b[0]))
+    )
+    .sort((a, b) => a[0].localeCompare(b[0]))
     .join(" ");
 }
 

package/src/dns.mjs

@@ -184,74 +184,86 @@ export class DNSService extends Base {
 async function generateZoneDefs(dns, targetDir) {
   const ttl = dns.recordTTL;
   const updates = [Math.ceil(Date.now() / 1000), ...dns.soaUpdates].join(" ");
+  const nameService = dns.findService(DNS_SERVICE_FILTER);
+  const rname = dns.administratorEmail.replace(/@/, ".");
+
+  const SOARecord = DNSRecord(
+    "@",
+    "SOA",
+    dnsFullName(nameService.domainName),
+    dnsFullName(rname),
+    `(${updates})`
+  );
 
-  for (const domain of dns.domains) {
-    const isLocalDomain = dns.localDomains.has(domain);
-
-    const ownerName = isLocalDomain ? dns.owner.name : "FOREIGN";
-    const zones = [];
-    const records = new Set();
-
-    const nameService = dns.findService(DNS_SERVICE_FILTER);
-    const rname = dns.administratorEmail.replace(/@/, ".");
-
-    let maxKeyLength;
+  const NSRecord = DNSRecord(
+    "@",
+    "NS",
+    dnsFullName(nameService.ipAddressOrDomainName)
+  );
 
-    if (isLocalDomain) {
-      for (const mail of dns.owner.findServices({
-        type: "smtp",
-        priority: "<10"
-      })) {
-        records.add(
-          DNSRecord("@", "MX", mail.priority, dnsFullName(mail.domainName))
+  console.log(`${nameService}`, nameService.ipAddressOrDomainName);
+
+  const configs = [];
+
+  for (const host of dns.owner.hosts()) {
+    for (const domain of host.foreignDomainNames) {
+      const zone = {
+        id: domain,
+        file: `FOREIGN/${domain}.zone`,
+        records: new Set([SOARecord, NSRecord])
+      };
+      const config = {
+        name: `${domain}.zone.conf`,
+        zones: [zone]
+      };
+      configs.push(config);
+
+      for (const address of host.rawAddresses) {
+        zone.records.add(
+          DNSRecord(
+            "@",
+            isIPv6Address(address) ? "AAAA" : "A",
+            normalizeIPAddress(address)
+          )
         );
       }
     }
+  }
 
-    console.log(`${nameService} ${domain}`, nameService.ipAddressOrDomainName);
-    //console.log(dns.owner.fullName, domain, nameService.domainName, rname);
+  for (const domain of dns.localDomains) {
+    const ownerName = dns.owner.name;
     const reverseZones = new Map();
 
-    const SOARecord = DNSRecord(
-      "@",
-      "SOA",
-      dnsFullName(nameService.domainName),
-      dnsFullName(rname),
-      `(${updates})`
-    );
-
-    const NSRecord = DNSRecord(
-      "@",
-      "NS",
-      dnsFullName(nameService.ipAddressOrDomainName)
-    );
+    const config = {
+      name: `${domain}.zone.conf`,
+      zones: []
+    };
+    configs.push(config);
 
     const zone = {
       id: domain,
-      type: "plain",
       file: `${ownerName}/${domain}.zone`,
-      records: new Set([SOARecord, NSRecord, ...records])
+      records: new Set([SOARecord, NSRecord])
     };
-    zones.push(zone);
-
-    const catalogZone = {
-      id: `catalog.${domain}`,
-      type: "catalog",
-      file: `${ownerName}/catalog.${domain}.zone`,
-      records: new Set([
-        SOARecord,
-        NSRecord,
-        DNSRecord(dnsFullName(`version.catalog.${domain}`), "TXT", '"1"')
-      ])
-    };
-
-    const configs = {
-      plain: { name: `${domain}.zone.conf`, content: [] }
-    };
-
-    if (isLocalDomain && dns.hasCatalog) {
-      zones.push(catalogZone);
-      configs.catalog = { name: `catalog.${domain}.zone.conf`, content: [] };
+    config.zones.push(zone);
+
+    if (dns.hasCatalog) {
+      const catalogConfig = {
+        name: `catalog.${domain}.zone.conf`,
+        zones: []
+      };
+      configs.push(catalogConfig);
+
+      zone.catalogZone = {
+        id: `catalog.${domain}`,
+        file: `${ownerName}/catalog.${domain}.zone`,
+        records: new Set([
+          SOARecord,
+          NSRecord,
+          DNSRecord(dnsFullName(`version.catalog.${domain}`), "TXT", '"1"')
+        ])
+      };
+      catalogConfig.zones.push(zone.catalogZone);
     }
 
     const hosts = new Set();
@@ -290,7 +302,7 @@ async function generateZoneDefs(dns, targetDir) {
                 file: `${ownerName}/${reverseArpa}.zone`,
                 records: new Set([SOARecord, NSRecord])
               };
-              zones.push(reverseZone);
+              config.zones.push(reverseZone);
               reverseZones.set(subnet.address, reverseZone);
             }
 
@@ -306,7 +318,7 @@ async function generateZoneDefs(dns, targetDir) {
           }
         }
 
-        if (isLocalDomain && !hosts.has(host)) {
+        if (!hosts.has(host)) {
           hosts.add(host);
           for (const service of host.findServices()) {
             for (const record of service.dnsRecordsForDomainName(
@@ -319,15 +331,20 @@ async function generateZoneDefs(dns, targetDir) {
         }
       }
     }
+  }
+
+  for (const config of configs) {
+    console.log(`config: ${config.name}`);
 
-    for (const zone of zones) {
-      const content = configs[zone.type].content;
+    const content = [];
+    for (const zone of config.zones) {
+      console.log(`  zone: ${zone.id}`);
 
-      if (zone.type !== "catalog") {
+      if (zone.catalogZone) {
         const hash = createHmac("md5", zone.id).digest("hex");
-        catalogZone.records.add(
+        zone.catalogZone.records.add(
           DNSRecord(
-            `${hash}.zones.catalog.${domain}.`,
+            `${hash}.zones.catalog.${zone.id}.`,
             "PTR",
             dnsFullName(zone.id)
           )
@@ -347,7 +364,7 @@ async function generateZoneDefs(dns, targetDir) {
       content.push(`};`);
       content.push("");
 
-      maxKeyLength = 0;
+      let maxKeyLength = 0;
       for (const r of zone.records) {
         if (r.key.length > maxKeyLength) {
           maxKeyLength = r.key.length;
@@ -361,13 +378,11 @@ async function generateZoneDefs(dns, targetDir) {
       );
     }
 
-    for (const cfg of Object.values(configs)) {
-      await writeLines(
-        join(targetDir, "etc/named.d/zones"),
-        cfg.name,
-        cfg.content
-      );
-    }
+    await writeLines(
+      join(targetDir, "etc/named.d/zones"),
+      config.name,
+      content
+    );
   }
 }
 

package/src/host.mjs

@@ -254,10 +254,18 @@ export class Host extends Base {
     return parts[parts.length - 1];
   }
 
-  get domains() {
+  get foreignDomainNames() {
+    return [...this.aliases].filter(n => n.split(".").length > 1);
+  }
+
+  get foreignDomains() {
     return new Set(
       [...this.aliases].map(n => domainFromDominName(n, this.domain))
-    ).union(this.localDomains);
+    );
+  }
+
+  get domains() {
+    return this.foreignDomains.union(this.localDomains);
   }
 
   get domainNames() {

package/src/service.mjs

@@ -21,8 +21,8 @@ const ServiceTypes = {
     dnsRecord: { type: "HTTPS", parameters: { alpn: "h2" } }
   },
   http3: {
-    protocol: "tcp",
     type: "https",
+    protocol: "tcp",
     port: 443,
     tls: true,
     dnsRecord: {
@@ -31,7 +31,7 @@ const ServiceTypes = {
     }
   },
   rtsp: { protocol: "tcp", port: 554, tls: false },
-  smtp: { protocol: "tcp", port: 25, tls: false },
+  smtp: { protocol: "tcp", port: 25, tls: false, dnsRecord: { type: "MX" } },
   ssh: { protocol: "tcp", port: 22, tls: false },
   imap: { protocol: "tcp", port: 143, tls: false },
   imaps: { protocol: "tcp", port: 993, tls: true },
@@ -221,25 +221,31 @@ export class Service extends Base {
     if (dnsRecord) {
       let parameters = dnsRecord.parameters;
 
-      for (const service of this.findServices()) {
-        if (service !== this) {
-          const r = ServiceTypes[service.type]?.dnsRecord;
+      if (parameters) {
+        for (const service of this.findServices()) {
+          if (service !== this) {
+            const r = ServiceTypes[service.type]?.dnsRecord;
 
-          if (r?.type === dnsRecord.type) {
-            parameters = dnsMergeParameters(parameters, r.parameters);
+            if (r?.type === dnsRecord.type) {
+              parameters = dnsMergeParameters(parameters, r.parameters);
+            }
           }
         }
-      }
 
-      records.push(
-        DNSRecord(
-          dnsFullName(domainName),
-          dnsRecord.type,
-          this.priority,
-          ".",
-          dnsFormatParameters(parameters)
-        )
-      );
+        records.push(
+          DNSRecord(
+            dnsFullName(domainName),
+            dnsRecord.type,
+            this.priority,
+            ".",
+            dnsFormatParameters(parameters)
+          )
+        );
+      } else {
+        records.push(
+          DNSRecord("@", dnsRecord.type, this.priority, dnsFullName(domainName))
+        );
+      }
     }
 
     return records;

package/types/host.d.mts

@@ -185,6 +185,8 @@ export class Host extends Base {
     get distribution(): any;
     get modelName(): any;
     get hostName(): string;
+    get foreignDomainNames(): any[];
+    get foreignDomains(): Set<any>;
     get domains(): Set<any>;
     get domainNames(): any[];
     get domainName(): any;