pmcf 2.35.0 → 2.35.2

package/package.json

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

package/src/host.mjs

@@ -1,8 +1,8 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { ServiceOwner, Base } from "pmcf";
-import { networkAddressProperties, addresses } from "./network-support.mjs";
+import { ServiceOwner, Base, addresses } from "pmcf";
+import { networkAddressProperties } from "./network-support.mjs";
 import {
   domainFromDominName,
   domainName,

package/src/network-address.mjs

@@ -31,3 +31,17 @@ export class NetworkAddress {
     return `${this.networkInterface.fullName} ${decodeIP(this.address)}`;
   }
 }
+
+export function addresses(networkAddresses) {
+  return [
+    ...new Set(
+      [...networkAddresses].map(object =>
+        /*object?.name ||*/ decodeIP(object.address)
+      )
+    )
+  ];
+}
+
+export function cidrAddresses(networkAddresses) {
+  return [...networkAddresses].map(na => na.cidrAddress);
+}

package/src/network-interfaces/network-interface.mjs

@@ -1,13 +1,12 @@
 import { join } from "node:path";
 import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
-import { Base } from "pmcf";
+import { Base, cidrAddresses } from "pmcf";
 import {
   networkProperties,
   networkAddressProperties
 } from "../network-support.mjs";
 import { asArray, writeLines, sectionLines } from "../utils.mjs";
 import { addType } from "../types.mjs";
-import { cidrAddresses } from "../network-support.mjs";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
 
 export const NetworkInterfaceTypeDefinition = {

package/src/network-interfaces/skeleton.mjs

@@ -1,8 +1,7 @@
 import { join } from "node:path";
 import { writeLines, sectionLines } from "../utils.mjs";
-import { NetworkAddress, Host } from "pmcf";
+import { NetworkAddress, Host, cidrAddresses } from "pmcf";
 import { ServiceOwner } from "../service-owner.mjs";
-import { cidrAddresses } from "../network-support.mjs";
 
 export class SkeletonNetworkInterface extends ServiceOwner {
   _extends = [];

package/src/network-support.mjs

@@ -38,11 +38,3 @@ export const networkAddressProperties = {
   addresses: { type: "string", collection: true, writeable: false },
   address: { type: "string", collection: false, writeable: false }
 };
-
-export function addresses(networkAddresses) {
-  return [...networkAddresses].map(na => na.address);
-}
-
-export function cidrAddresses(networkAddresses) {
-  return [...networkAddresses].map(na => na.cidrAddress);
-}

package/src/service.mjs

@@ -10,11 +10,6 @@ import {
 } from "./dns-utils.mjs";
 
 const ServiceTypes = {
-  "systemd-resolved": { endpoints: [] },
-  "systemd-timesyncd": { endpoints: [] },
-  "systemd-journal": { endpoints: [] },
-  "systemd-journal-remote": { endpoints: [] },
-  "systemd-journal-upload": { endpoints: [] },
   ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
   dns: { endpoints: [{ protocol: "udp", port: 53, tls: false }] },
   ldap: { endpoints: [{ protocol: "tcp", port: 389, tls: false }] },

package/src/services/dns.mjs

@@ -1,19 +1,23 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isLinkLocal, reverseArpa, decodeIP } from "ip-utilties";
-import { writeLines } from "../utils.mjs";
+import { isLinkLocal, reverseArpa } from "ip-utilties";
+import { writeLines, asArray } from "../utils.mjs";
 import {
   DNSRecord,
   dnsFullName,
   dnsRecordTypeForAddressFamily,
   sortZoneRecords
 } from "../dns-utils.mjs";
-import { ExtraSourceService, Endpoint, serviceEndpoints } from "pmcf";
+import {
+  ExtraSourceService,
+  Endpoint,
+  serviceEndpoints,
+  addresses
+} from "pmcf";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
-import { addresses } from "../network-support.mjs";
 import { addHook } from "../hooks.mjs";
 
 const address_types = ["network", "host", "network_interface"];
@@ -87,23 +91,8 @@ const statisticsEndpoint = {
   tls: false
 };
 
-function addressList(objects) {
-  return Array.from(objects).map(object => {
-    switch (typeof object) {
-      case "string":
-        return object;
-      case "object":
-        if (object.name) {
-          return object.name;
-        }
-
-        return decodeIP(object);
-    }
-  });
-}
-
 function addressesStatement(prefix, objects, generateEmpty = false) {
-  const body = addressList(objects).map(name => `  ${name};`);
+  const body = asArray(objects).map(name => `  ${name};`);
 
   if (body.length || generateEmpty) {
     return [`${prefix} {`, body, "};"];
@@ -221,7 +210,7 @@ export class DNSService extends ExtraSourceService {
     };
 
     const forwarders = serviceEndpoints(this.source, {
-      services: { type: "dns", priority: ">=10" },
+      services: { type: "dns", priority: ">=20" },
       select: e => e.address
     });
 
@@ -235,8 +224,11 @@ export class DNSService extends ExtraSourceService {
 
     const acls = [
       addressesStatement("acl trusted", addresses(this.trusted)),
-      addressesStatement("acl protected", addresses(this.protected)),
-      addressesStatement("acl open", addresses(this.open), true)
+      addressesStatement("acl open", addresses(this.open), true),
+      addressesStatement("acl protected", [
+        ...addresses(this.protected),
+        "!open"
+      ])
     ].flat();
 
     if (acls.length) {

package/src/services/ntp.mjs

@@ -65,7 +65,7 @@ export class NTPService extends ExtraSourceService {
       ...serviceEndpoints(this, {
         services: {
           type: "ntp",
-          priority: ">=10"
+          priority: ">=20"
         },
         endpoints: e =>
           e.family === "IPv4" && e.networkInterface.kind !== "loopback",

package/src/services/systemd-resolved.mjs

@@ -52,7 +52,7 @@ export class SystemdResolvedService extends ExtraSourceService {
         "Resolve",
         {
           DNS: serviceEndpoints(this, options("<10")),
-          FallbackDNS: serviceEndpoints(this, options(">=10")),
+          FallbackDNS: serviceEndpoints(this, options(">=20")),
           Domains: [...this.localDomains].join(" "),
           DNSSEC: "no",
           MulticastDNS: this.network.multicastDNS ? "yes" : "no",

package/src/services/systemd-timesyncd.mjs

@@ -45,7 +45,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
           NTP: serviceEndpoints(this, {
             services: {
               type: "ntp",
-              priority: "<20"
+              priority: "<10"
             },
             endpoints: endpoint =>
               endpoint.networkInterface.kind !== "loopback",

package/types/network-address.d.mts

@@ -1,3 +1,5 @@
+export function addresses(networkAddresses: any): any[];
+export function cidrAddresses(networkAddresses: any): any[];
 /**
  *
  */

package/types/network-support.d.mts

@@ -1,5 +1,3 @@
-export function addresses(networkAddresses: any): any[];
-export function cidrAddresses(networkAddresses: any): any[];
 export namespace networkProperties {
     export namespace scope {
         export let type: string;