node-ikev2 0.2.1 → 0.3.1

package/lib/src/ip-address.js

@@ -32,8 +32,9 @@ function parseIPv4AddressString(addressString) {
     return buffer;
 }
 function formatIPv4AddressBuffer(buffer) {
+    // Empty INTERNAL_IP4_* in CFG_REQUEST means "please assign" (RFC 7296).
     if (buffer.length === 0) {
-        throw new Error(`Invalid IPv4 address ${buffer}`);
+        return "";
     }
     if (buffer.length !== 4) {
         throw new Error(`Invalid IPv4 address ${buffer}`);

package/lib/src/payload.d.ts

@@ -106,7 +106,6 @@ export declare class PayloadSA extends Payload {
     nextPayload: payloadType;
     proposals: Proposal[];
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, proposals: Proposal[], critical?: boolean, length?: number);
     /**
      * Parses a Security Association Payload from a buffer
@@ -153,7 +152,6 @@ export declare class PayloadKE extends Payload {
     dhGroup: number;
     keyData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, dhGroup: number, keyData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Key Exchange Payload from a buffer
@@ -213,7 +211,6 @@ export declare class PayloadID extends Payload {
     idType: number;
     idData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, idType: number, idData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an Identification Payload from a buffer
@@ -260,7 +257,6 @@ export declare class PayloadIDi extends PayloadID {
     idType: number;
     idData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, idType: number, idData: Buffer, critical?: boolean, length?: number);
 }
 /**
@@ -273,8 +269,7 @@ export declare class PayloadIDr extends PayloadID {
     idType: number;
     idData: Buffer;
     critical: boolean;
-    length: number;
-    constructor(nextPayload: payloadType, idType: number, idData: Buffer, critical: boolean, length: number);
+    constructor(nextPayload: payloadType, idType: number, idData: Buffer, critical?: boolean, length?: number);
 }
 /**
  * IKEv2 Notify Message Types
@@ -307,7 +302,6 @@ export declare class PayloadCERT extends Payload {
     certEncoding: number;
     certData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, certEncoding: number, certData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Certificate Payload from a buffer
@@ -354,7 +348,6 @@ export declare class PayloadCERTREQ extends Payload {
     certEncoding: number;
     certAuthority: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, certEncoding: number, certAuthority: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Certificate Request Payload from a buffer
@@ -401,7 +394,6 @@ export declare class PayloadAUTH extends Payload {
     authMethod: number;
     authData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, authMethod: number, authData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an Authentication Payload from a buffer
@@ -447,7 +439,6 @@ export declare class PayloadNONCE extends Payload {
     nextPayload: payloadType;
     nonceData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, nonceData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Nonce Payload from a buffer
@@ -593,7 +584,6 @@ export declare class PayloadNOTIFY extends Payload {
     spi: Buffer;
     notifyData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, protocolId: securityProtocolId, spiSize: number, notifyType: number, spi: Buffer, notifyData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Notify Payload from a buffer
@@ -642,7 +632,6 @@ export declare class PayloadDELETE extends Payload {
     numSpi: number;
     spis: Buffer[];
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, protocolId: number, spiSize: number, numSpi: number, spis: Buffer[], critical?: boolean, length?: number);
     /**
      * Parses a Delete Payload from a buffer
@@ -688,7 +677,6 @@ export declare class PayloadVENDOR extends Payload {
     nextPayload: payloadType;
     vendorId: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, vendorId: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Vendor ID Payload from a buffer
@@ -735,7 +723,6 @@ export declare class PayloadTS extends Payload {
     tsType: payloadType;
     tsList: TrafficSelector[];
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, tsType: payloadType, tsList: TrafficSelector[], critical?: boolean, length?: number);
     /**
      * Parses a Traffic Selector Payload from a buffer
@@ -781,7 +768,6 @@ export declare class PayloadTSi extends PayloadTS {
     nextPayload: payloadType;
     tsList: TrafficSelector[];
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, tsList: TrafficSelector[], critical?: boolean, length?: number);
 }
 /**
@@ -793,7 +779,6 @@ export declare class PayloadTSr extends PayloadTS {
     nextPayload: payloadType;
     tsList: TrafficSelector[];
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, tsList: TrafficSelector[], critical?: boolean, length?: number);
 }
 /**
@@ -805,7 +790,6 @@ export declare class PayloadSK extends Payload {
     nextPayload: payloadType;
     encryptedData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, encryptedData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an SK Payload from a buffer
@@ -912,7 +896,6 @@ export declare class PayloadCP extends Payload {
     cfgType: number;
     cfgData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, cfgType: number, cfgData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Configuration Payload from a buffer
@@ -958,7 +941,6 @@ export declare class PayloadEAP extends Payload {
     nextPayload: payloadType;
     eapMessage: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, eapMessage: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an EAP Payload from a buffer

package/lib/src/payload.js

@@ -226,7 +226,6 @@ class PayloadSA extends Payload {
         this.nextPayload = nextPayload;
         this.proposals = proposals;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Security Association Payload from a buffer
@@ -339,7 +338,6 @@ class PayloadKE extends Payload {
         this.dhGroup = dhGroup;
         this.keyData = keyData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Key Exchange Payload from a buffer
@@ -469,12 +467,11 @@ var IDType;
  */
 class PayloadID extends Payload {
     constructor(nextPayload, idType, idData, critical = false, length = 0) {
-        super(payloadType.NONE, nextPayload, critical, length > 0 ? length : 5 + idData.length);
+        super(payloadType.NONE, nextPayload, critical, length > 0 ? length : 8 + idData.length);
         this.nextPayload = nextPayload;
         this.idType = idType;
         this.idData = idData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses an Identification Payload from a buffer
@@ -593,12 +590,11 @@ exports.PayloadID = PayloadID;
  */
 class PayloadIDi extends PayloadID {
     constructor(nextPayload, idType, idData, critical = false, length = 0) {
-        super(nextPayload, idType, idData, critical, length > 0 ? length : 5 + idData.length);
+        super(nextPayload, idType, idData, critical, length > 0 ? length : 8 + idData.length);
         this.nextPayload = nextPayload;
         this.idType = idType;
         this.idData = idData;
         this.critical = critical;
-        this.length = length;
         this.type = payloadType.IDi;
     }
 }
@@ -609,13 +605,12 @@ exports.PayloadIDi = PayloadIDi;
  * @extends PayloadID
  */
 class PayloadIDr extends PayloadID {
-    constructor(nextPayload, idType, idData, critical, length) {
-        super(nextPayload, idType, idData, critical, length > 0 ? length : 5 + idData.length);
+    constructor(nextPayload, idType, idData, critical = false, length = 0) {
+        super(nextPayload, idType, idData, critical, length > 0 ? length : 8 + idData.length);
         this.nextPayload = nextPayload;
         this.idType = idType;
         this.idData = idData;
         this.critical = critical;
-        this.length = length;
         this.type = payloadType.IDr;
     }
 }
@@ -654,7 +649,6 @@ class PayloadCERT extends Payload {
         this.certEncoding = certEncoding;
         this.certData = certData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Certificate Payload from a buffer
@@ -740,7 +734,6 @@ class PayloadCERTREQ extends Payload {
         this.certEncoding = certEncoding;
         this.certAuthority = certAuthority;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Certificate Request Payload from a buffer
@@ -813,12 +806,11 @@ exports.PayloadCERTREQ = PayloadCERTREQ;
  */
 class PayloadAUTH extends Payload {
     constructor(nextPayload, authMethod, authData, critical = false, length = 0) {
-        super(payloadType.AUTH, nextPayload, critical, length > 0 ? length : 5 + authData.length);
+        super(payloadType.AUTH, nextPayload, critical, length > 0 ? length : 8 + authData.length);
         this.nextPayload = nextPayload;
         this.authMethod = authMethod;
         this.authData = authData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses an Authentication Payload from a buffer
@@ -901,7 +893,6 @@ class PayloadNONCE extends Payload {
         this.nextPayload = nextPayload;
         this.nonceData = nonceData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Nonce Payload from a buffer
@@ -1079,7 +1070,6 @@ class PayloadNOTIFY extends Payload {
         this.spi = spi;
         this.notifyData = notifyData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Notify Payload from a buffer
@@ -1176,7 +1166,6 @@ class PayloadDELETE extends Payload {
         this.numSpi = numSpi;
         this.spis = spis;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Delete Payload from a buffer
@@ -1279,7 +1268,6 @@ class PayloadVENDOR extends Payload {
         this.nextPayload = nextPayload;
         this.vendorId = vendorId;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Vendor ID Payload from a buffer
@@ -1348,12 +1336,11 @@ exports.PayloadVENDOR = PayloadVENDOR;
  */
 class PayloadTS extends Payload {
     constructor(nextPayload, tsType, tsList, critical = false, length = 0) {
-        super(tsType, nextPayload, critical, length > 0 ? length : 0);
+        super(tsType, nextPayload, critical, length > 0 ? length : 8 + tsList.reduce((acc, ts) => acc + ts.length, 0));
         this.nextPayload = nextPayload;
         this.tsType = tsType;
         this.tsList = tsList;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Traffic Selector Payload from a buffer
@@ -1383,12 +1370,11 @@ class PayloadTS extends Payload {
      */
     static serializeJSON(json) {
         var _a;
-        // const type = json.type; // TODO include the type in the JSON, as it is discriminating
         const buffer = Buffer.alloc(json.length);
         const genericPayload = Payload.serializeJSON(json);
         genericPayload.copy(buffer);
         buffer.writeUInt8(json.numTs, 4);
-        const tsListBuffer = ((_a = json.tList) === null || _a === void 0 ? void 0 : _a.lenght) > 0
+        const tsListBuffer = ((_a = json.tsList) === null || _a === void 0 ? void 0 : _a.length) > 0
             ? json.tsList.map((ts) => selector_1.TrafficSelector.serializeJSON(ts))
             : [Buffer.alloc(0)];
         let offset = 8;
@@ -1447,11 +1433,10 @@ exports.PayloadTS = PayloadTS;
  */
 class PayloadTSi extends PayloadTS {
     constructor(nextPayload, tsList, critical = false, length = 0) {
-        super(nextPayload, payloadType.TSi, tsList, critical, length > 0 ? length : 0);
+        super(nextPayload, payloadType.TSi, tsList, critical, length);
         this.nextPayload = nextPayload;
         this.tsList = tsList;
         this.critical = critical;
-        this.length = length;
         this.type = payloadType.TSi;
     }
 }
@@ -1463,11 +1448,10 @@ exports.PayloadTSi = PayloadTSi;
  */
 class PayloadTSr extends PayloadTS {
     constructor(nextPayload, tsList, critical = false, length = 0) {
-        super(nextPayload, payloadType.TSr, tsList, critical, length > 0 ? length : 0);
+        super(nextPayload, payloadType.TSr, tsList, critical, length);
         this.nextPayload = nextPayload;
         this.tsList = tsList;
         this.critical = critical;
-        this.length = length;
         this.type = payloadType.TSr;
     }
 }
@@ -1483,7 +1467,6 @@ class PayloadSK extends Payload {
         this.nextPayload = nextPayload;
         this.encryptedData = encryptedData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses an SK Payload from a buffer
@@ -1668,12 +1651,11 @@ var cfgType;
  */
 class PayloadCP extends Payload {
     constructor(nextPayload, cfgType, cfgData, critical = false, length = 0) {
-        super(payloadType.CP, nextPayload, critical, length > 0 ? length : 5 + cfgData.length);
+        super(payloadType.CP, nextPayload, critical, length > 0 ? length : 8 + cfgData.length);
         this.nextPayload = nextPayload;
         this.cfgType = cfgType;
         this.cfgData = cfgData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Configuration Payload from a buffer
@@ -1752,7 +1734,6 @@ class PayloadEAP extends Payload {
         this.nextPayload = nextPayload;
         this.eapMessage = eapMessage;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses an EAP Payload from a buffer

package/lib/src/selector.js

@@ -59,7 +59,7 @@ class TrafficSelector {
     static parse(buffer) {
         try {
             const type = buffer.readUInt8(0);
-            var expectedLength;
+            let expectedLength;
             switch (type) {
                 case TrafficSelectorType.TS_IPV4_ADDR_RANGE:
                     expectedLength = 16;
@@ -77,8 +77,8 @@ class TrafficSelector {
             }
             const startPort = buffer.readUInt16BE(4);
             const endPort = buffer.readUInt16BE(6);
-            var startAddress;
-            var endAddress;
+            let startAddress;
+            let endAddress;
             switch (type) {
                 case TrafficSelectorType.TS_IPV4_ADDR_RANGE:
                     startAddress = buffer.subarray(8, 12);
@@ -105,8 +105,8 @@ class TrafficSelector {
      * @returns {Buffer}
      */
     static serializeJSON(json) {
-        var length;
-        var ipLength;
+        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) {
@@ -136,7 +136,7 @@ class TrafficSelector {
      * @returns {Buffer}
      */
     serialize() {
-        var ipLength;
+        let ipLength;
         switch (this.type) {
             case TrafficSelectorType.TS_IPV4_ADDR_RANGE:
                 if (this.startAddress.length != 4 || this.endAddress.length != 4) {

package/package.json

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