pmcf 6.41.10 → 6.43.0

package/package.json

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

package/src/services/kea.mjs

@@ -2,12 +2,15 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import {
   reverseArpa,
-  isLinkLocal,
+  addressType,
   FAMILY_IPV4,
-  FAMILY_IPV6
+  FAMILY_IPV6,
+  ADDRESS_TYPE_LOOPBACK
 } from "ip-utilties";
 import {
+  name_attribute,
   string_attribute_writable,
+  string_collection_attribute_writable,
   number_attribute_writable,
   boolean_attribute_writable_true,
   default_collection_attribute_writable,
@@ -15,23 +18,40 @@ import {
 } from "pacc";
 import {
   addType,
+  Subnet,
   CoreService,
   Endpoint,
-  endpointAddresses,
   sortDescendingByPriority,
-  endpoints,
-  SUBNET_LOCALHOST_IPV4,
-  SUBNET_LOCALHOST_IPV6,
   FAMILY_UNIX
 } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
+class kea_subnet extends Subnet {
+  static attributes = {
+    pool: {
+      ...string_collection_attribute_writable,
+      name: "pool"
+    }
+  };
+
+  static {
+    addType(this);
+  }
+
+  pool = [];
+}
+
 export class kea extends CoreService {
   static attributes = {
-    dnsServers: {
+    subnets: {
+      ...default_collection_attribute_writable,
+      type: kea_subnet,
+      name: "subnets"
+    },
+    dnsServerEndpoints: {
       ...default_collection_attribute_writable,
       type: Endpoint,
-      name: "dnsServers",
+      name: "dnsServerEndpoints",
       deferredExpression: true
     },
     "ddns-send-updates": {
@@ -135,6 +155,8 @@ export class kea extends CoreService {
     addType(this);
   }
 
+  subnets = new Map();
+
   async *preparePackages(dir) {
     const ctrlAgentEndpoint = this.endpoint("kea-ha-4");
 
@@ -144,24 +166,10 @@ export class kea extends CoreService {
 
     const network = this.network;
     const host = this.host;
-
     const source = host.owner;
     const name = host.name;
-
-    const subnets = [...new Map(this.subnets).values()].filter(
-      s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
-    ); // TODO should be normal
-    /*console.log(
-      "SUBNETS",
-      subnets.map(s => s.fullName)
-    );*/
-
-    //console.log(source.fullName, [...source.hosts.keys()]);
-
-    const dnsServerEndpoints = endpoints(this.dnsServers).filter(
-      e => e.networkInterface?.kind !== "loopback"
-    );
-
+    const subnets = [...this.subnets.values()];
+    const dnsServerEndpoints = this.dnsServerEndpoints;
     const packageData = await this.packageData;
 
     packageData.sources.push(
@@ -270,7 +278,8 @@ export class kea extends CoreService {
             data: dnsServerEndpoints
               .filter(
                 endpoint =>
-                  endpoint.family === `IPv${family}` && endpoint.type === "dns"
+                  endpoint.family === `IPv${family}` &&
+                  addressType(endpoint.address) !== ADDRESS_TYPE_LOOPBACK
               )
               .map(endpoint => endpoint.address)
               .join(",")
@@ -322,7 +331,8 @@ export class kea extends CoreService {
           "dns-servers": dnsServerEndpoints
             .filter(
               endpoint =>
-                endpoint.family === FAMILY_IPV4 && endpoint.type === "dns"
+                endpoint.family === FAMILY_IPV4 &&
+                addressType(endpoint.address) !== ADDRESS_TYPE_LOOPBACK
             )
             .map(endpoint => {
               return { "ip-address": endpoint.address };
@@ -402,29 +412,18 @@ export class kea extends CoreService {
           endpoint.type === "dhcp" &&
           endpoint.family === family &&
           endpoint.networkInterface.kind !== "loopback" &&
-          endpoint.networkInterface.kind !== "wlan" &&
           endpoint.networkInterface.kind !== "tun"
       ).map(
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
       );
 
-    const pools = subnet => {
-      return subnet.dhcpPools.map(pool => {
-        return { pool: Array.isArray(pool) ? pool.join(" - ") : pool };
-      });
-    };
+    const pools = subnet => [{ pool: subnet.pool.join(" - ") }];
 
     const dhcp4 = {
       Dhcp4: {
         ...(await commonConfig("4")),
         subnet4: subnets
-          .filter(
-            s =>
-              s.family === FAMILY_IPV4 &&
-              // TODO keep out tailscale
-              s.cidr !== "100.64.0.2/32" &&
-              s.cidr !== "100.64.0.3/32"
-          )
+          .filter(s => s.family === FAMILY_IPV4)
           .map((subnet, index) => {
             return {
               id: index + 1,
@@ -445,13 +444,7 @@ export class kea extends CoreService {
       Dhcp6: {
         ...(await commonConfig("6")),
         subnet6: subnets
-          .filter(
-            s =>
-              s.family === FAMILY_IPV6 &&
-              !isLinkLocal(s.address) &&
-              // TODO keep out tailscale
-              s.cidr !== "fd7a:115c:a1e0::/64"
-          )
+          .filter(s => s.family === FAMILY_IPV6)
           .map((subnet, index) => {
             return {
               id: index + 1,

package/src/subnet.mjs

@@ -3,7 +3,6 @@ import {
   rangeIP,
   decodeIP,
   matchPrefixIP,
-  FAMILY_IPV6
 } from "ip-utilties";
 import { string_attribute, name_attribute, integer_attribute } from "pacc";
 import { networks_attribute } from "./common-attributes.mjs";
@@ -30,6 +29,12 @@ export class Subnet extends core {
 
   constructor(owner, address) {
     super();
+
+    switch(typeof address) {
+      case "object":
+        address = address.address;
+    }
+
     const { longPrefix, prefix, prefixLength, cidr, family } =
       normalizeCIDR(address);
 
@@ -71,16 +76,6 @@ export class Subnet extends core {
     return rangeIP(this.prefix, this.prefixLength, 1, 1).map(a => decodeIP(a));
   }
 
-  get dhcpPools() {
-    /* TODO where to take values from ? */
-
-    return [
-      this.family === FAMILY_IPV6
-        ? this.cidr
-        : rangeIP(this.prefix, this.prefixLength, 51, 20).map(a => decodeIP(a))
-    ];
-  }
-
   get longAddress() {
     return `${this.longPrefix}/${this.prefixLength}`;
   }