pmcf 1.35.1 → 1.35.2

package/package.json

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

package/src/utils.mjs

@@ -57,6 +57,30 @@ export function normalizeIPAddress(address) {
   return parts.map(s => s.padStart(4, "0")).join(":");
 }
 
+function encodeIPv4(address) {
+  const octets = [0, 0, 0, 0];
+
+  let i = 0;
+  for (const a of address.split(/\./)) {
+    octets[i++] = parseInt(a);
+  }
+
+  return (octets[0] << 24) + (octets[1] << 16) + (octets[2] << 8) + octets[3];
+}
+
+function decodeIPv4(address, length = 32) {
+  const octets = [
+    (address >> 24) & 0xff,
+    (address >> 16) & 0xff,
+    (address >> 8) & 0xff,
+    address & 0xff
+  ];
+
+  octets.length = Math.ceil(length / 8);
+
+  return octets.join(".");
+}
+
 export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
 
@@ -66,8 +90,9 @@ export function normalizeCIDR(address) {
   } else {
     if (prefixLength) {
       if (isIPv4Address(prefix)) {
-        const parts = prefix.split(/\./);
-        prefix = parts.slice(0, prefixLength / 8).join(".");
+        let n = encodeIPv4(prefix);
+        n = n & (0xffffffff << (32 - prefixLength));
+        prefix = decodeIPv4(n, prefixLength);
       } else {
         prefix = normalizeIPAddress(prefix);
         const parts = prefix.split(/\:/);