pmcf 1.35.2 → 1.35.4

package/bin/pmcf-named-defs

@@ -19,6 +19,10 @@ console.log("depends", "mf-named");
 console.log("replaces", "mf-named-zones");
 console.log("description", `named defintions for ${owner.name}`);
 
+function fullName(name) {
+  return name.endsWith(".") ? name : name + ".";
+}
+
 async function generateNamedDefs(owner, targetDir) {
   const dns = owner.dns;
   const ttl = dns.recordTTL;
@@ -33,20 +37,24 @@ async function generateNamedDefs(owner, targetDir) {
 
     let maxKeyLength;
 
-    const createRecord = (key, type, value) => {
+    const createRecord = (key, type, ...values) => {
+      values = values.map(v =>
+        typeof v === "number" ? String(v).padStart(3) : v
+      );
+
       return {
         key,
         toString: () =>
           `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(
             5,
             " "
-          )} ${value}`
+          )} ${values.join(" ")}`
       };
     };
 
     for await (const mail of owner.services({ type: "smtp" })) {
       records.add(
-        createRecord("@", "MX", `${mail.priority} ${mail.owner.domainName}.`)
+        createRecord("@", "MX", mail.priority, fullName(mail.owner.domainName))
       );
     }
 
@@ -55,10 +63,12 @@ async function generateNamedDefs(owner, targetDir) {
     const SOARecord = createRecord(
       "@",
       "SOA",
-      `${nameserver?.domainName}. ${rname}. (${updates})`
+      fullName(nameserver?.domainName),
+      fullName(rname),
+      `(${updates})`
     );
 
-    const NSRecord = createRecord("@", "NS", `${nameserver?.ipAddress}.`);
+    const NSRecord = createRecord("@", "NS", fullName(nameserver?.ipAddress));
 
     const catalogZone = {
       id: `catalog.${domain}`,
@@ -66,7 +76,7 @@ async function generateNamedDefs(owner, targetDir) {
       records: new Set([
         SOARecord,
         NSRecord,
-        createRecord(`version.${domain}.`, "TXT", '"2"')
+        createRecord(fullName(`version.${domain}`), "TXT", '"2"')
       ])
     };
 
@@ -78,7 +88,7 @@ async function generateNamedDefs(owner, targetDir) {
     zones.push(zone);
 
     for (const subnet of owner.subnets()) {
-      if (subnet.prefix) {
+      if (!subnet.isLinkLocal && subnet.prefix) {
         const reverseArpa = reverseArpaAddress(subnet.prefix);
         const reverseZone = {
           id: reverseArpa,
@@ -101,30 +111,28 @@ async function generateNamedDefs(owner, targetDir) {
       if (!hosts.has(host)) {
         zone.records.add(
           createRecord(
-            host.domainName + ".",
-            isIPv4Address(address) ? "A   " : "AAAA",
+            fullName(host.domainName),
+            isIPv4Address(address) ? "A" : "AAAA",
             normalizeIPAddress(address)
           )
         );
         hosts.add(host);
         for (const service of host.services()) {
-          //console.log(service.name);
           if (service.master && service.alias) {
             zone.records.add(
-              createRecord(service.alias, "CNAME", `${host.domainName}.`)
+              createRecord(service.alias, "CNAME", fullName(host.domainName))
             );
           }
 
           if (dns.hasSVRRecords && service.srvPrefix) {
             zone.records.add(
               createRecord(
-                `${service.srvPrefix}.${host.domainName}.`,
+                fullName(`${service.srvPrefix}.${host.domainName}`),
                 "SRV",
-                `${String(service.priority).padStart(4)} ${String(
-                  service.weight
-                ).padStart(3)} ${String(service.port).padStart(5)} ${
-                  host.domainName
-                }.`
+                service.priority,
+                service.weight,
+                service.port,
+                fullName(host.domainName)
               )
             );
           }
@@ -133,12 +141,12 @@ async function generateNamedDefs(owner, targetDir) {
 
       const reverseZone = networkInterface.network.subnet?.reverseZone;
 
-      if (reverseZone && isIPv4Address(address)) {
+      if (reverseZone) {
         reverseZone.records.add(
           createRecord(
-            reverseArpaAddress(address) + ".",
+            fullName(reverseArpaAddress(address)),
             "PTR",
-            `${networkInterface.host.domainName}.`
+            fullName(networkInterface.host.domainName)
           )
         );
       }

package/package.json

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

package/src/owner.mjs

@@ -1,4 +1,4 @@
-import { asArray, normalizeCIDR } from "./utils.mjs";
+import { asArray, normalizeCIDR, isLinkLocal } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";
 
@@ -368,6 +368,11 @@ export class Subnet extends Base {
     return address.startsWith(this.prefix);
   }
 
+  get isLinkLocal()
+  {
+    return isLinkLocal(this.address);
+  }
+
   get prefix() {
     const [prefix] = this.name.split("/");
     return prefix;

package/types/owner.d.mts

@@ -43,6 +43,7 @@ export class Network extends Owner {
 export class Subnet extends Base {
     networks: Set<any>;
     matchesAddress(address: any): any;
+    get isLinkLocal(): any;
     get prefix(): any;
     get prefixLength(): number;
     get address(): any;