node-ikev2 0.1.4 → 0.3.0

package/lib/src/selector.js

@@ -1,4 +1,7 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrafficSelector = exports.TrafficSelectorType = void 0;
+const ip_address_1 = require("./ip-address");
 /**
  * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -17,8 +20,6 @@
 
                         Traffic Selector
 */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TrafficSelector = exports.TrafficSelectorType = void 0;
 /**
  * Traffic Selector Type
  */
@@ -39,14 +40,14 @@ var TrafficSelectorType;
  * @property {Buffer} endAddress - 4 bytes
  */
 class TrafficSelector {
-    constructor(type, protocolId, length, startPort, endPort, startAddress, endAddress) {
+    constructor(type, protocolId, startPort, endPort, startAddress, endAddress, length = 0) {
         this.type = type;
         this.protocolId = protocolId;
-        this.length = length;
         this.startPort = startPort;
         this.endPort = endPort;
         this.startAddress = startAddress;
         this.endAddress = endAddress;
+        this.length = length;
     }
     /**
      * Parses a Traffic Selector from a buffer
@@ -58,16 +59,42 @@ class TrafficSelector {
     static parse(buffer) {
         try {
             const type = buffer.readUInt8(0);
+            let expectedLength;
+            switch (type) {
+                case TrafficSelectorType.TS_IPV4_ADDR_RANGE:
+                    expectedLength = 16;
+                    break;
+                case TrafficSelectorType.TS_IPV6_ADDR_RANGE:
+                    expectedLength = 40;
+                    break;
+                default:
+                    throw new Error("Invalid traffic selector type");
+            }
             const protocolId = buffer.readUInt8(1);
             const length = buffer.readUInt16BE(2);
+            if (length !== expectedLength) {
+                throw new Error("Invalid traffic selector length");
+            }
             const startPort = buffer.readUInt16BE(4);
             const endPort = buffer.readUInt16BE(6);
-            const startAddress = buffer.subarray(8, 12);
-            const endAddress = buffer.subarray(12, 16);
-            return new TrafficSelector(type, protocolId, length, startPort, endPort, startAddress, endAddress);
+            let startAddress;
+            let endAddress;
+            switch (type) {
+                case TrafficSelectorType.TS_IPV4_ADDR_RANGE:
+                    startAddress = buffer.subarray(8, 12);
+                    endAddress = buffer.subarray(12, 16);
+                    break;
+                case TrafficSelectorType.TS_IPV6_ADDR_RANGE:
+                    startAddress = buffer.subarray(8, 24);
+                    endAddress = buffer.subarray(24, 40);
+                    break;
+                default:
+                    throw new Error("Invalid traffic selector type");
+            }
+            return new TrafficSelector(type, protocolId, startPort, endPort, startAddress, endAddress, length);
         }
         catch (error) {
-            throw new Error("Failed to parse traffic selector");
+            throw new Error("Failed to parse traffic selector: " + error);
         }
     }
     /**
@@ -78,14 +105,29 @@ class TrafficSelector {
      * @returns {Buffer}
      */
     static serializeJSON(json) {
-        const buffer = Buffer.alloc(16);
+        let length;
+        let ipLength;
+        const startAddress = (0, ip_address_1.parseIPAddressString)(json.startAddress);
+        const endAddress = (0, ip_address_1.parseIPAddressString)(json.endAddress);
+        if (startAddress.length === 4 && endAddress.length === 4) {
+            length = 16;
+            ipLength = 4;
+        }
+        else if (startAddress.length === 16 && endAddress.length === 16) {
+            length = 40;
+            ipLength = 16;
+        }
+        else {
+            throw new Error("Invalid traffic selector length");
+        }
+        const buffer = Buffer.alloc(length);
         buffer.writeUInt8(json.type, 0);
         buffer.writeUInt8(json.protocolId, 1);
-        buffer.writeUInt16BE(json.length, 2);
+        buffer.writeUInt16BE(length, 2);
         buffer.writeUInt16BE(json.startPort, 4);
         buffer.writeUInt16BE(json.endPort, 6);
-        Buffer.from(json.startAddress, "hex").copy(buffer, 8);
-        Buffer.from(json.endAddress, "hex").copy(buffer, 12);
+        startAddress.copy(buffer, 8);
+        endAddress.copy(buffer, 8 + ipLength);
         return buffer;
     }
     /**
@@ -94,14 +136,33 @@ class TrafficSelector {
      * @returns {Buffer}
      */
     serialize() {
-        const buffer = Buffer.alloc(16);
+        let ipLength;
+        switch (this.type) {
+            case TrafficSelectorType.TS_IPV4_ADDR_RANGE:
+                if (this.startAddress.length != 4 || this.endAddress.length != 4) {
+                    throw new Error("Invalid traffic selector length");
+                }
+                this.length = 16;
+                ipLength = 4;
+                break;
+            case TrafficSelectorType.TS_IPV6_ADDR_RANGE:
+                if (this.startAddress.length != 16 || this.endAddress.length != 16) {
+                    throw new Error("Invalid traffic selector length");
+                }
+                this.length = 40;
+                ipLength = 16;
+                break;
+            default:
+                throw new Error("Invalid traffic selector type");
+        }
+        const buffer = Buffer.alloc(this.length);
         buffer.writeUInt8(this.type, 0);
         buffer.writeUInt8(this.protocolId, 1);
         buffer.writeUInt16BE(this.length, 2);
         buffer.writeUInt16BE(this.startPort, 4);
         buffer.writeUInt16BE(this.endPort, 6);
         this.startAddress.copy(buffer, 8);
-        this.endAddress.copy(buffer, 12);
+        this.endAddress.copy(buffer, 8 + ipLength);
         return buffer;
     }
     /**
@@ -113,11 +174,10 @@ class TrafficSelector {
         return {
             type: this.type,
             protocolId: this.protocolId,
-            length: this.length,
             startPort: this.startPort,
             endPort: this.endPort,
-            startAddress: this.startAddress.toString("hex"),
-            endAddress: this.endAddress.toString("hex"),
+            startAddress: (0, ip_address_1.formatIPAddressBuffer)(this.startAddress),
+            endAddress: (0, ip_address_1.formatIPAddressBuffer)(this.endAddress),
         };
     }
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-ikev2",
   "title": "Node-IKEV2",
-  "version": "0.1.4",
+  "version": "0.3.0",
   "description": "IKEv2 parser and serializer for Node.js",
   "main": "./lib/src/index.js",
   "types": "./lib/src/index.d.ts",