node-ikev2 0.1.0 → 0.1.2

package/lib/src/index.js

@@ -18,13 +18,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ikev2 = void 0;
 __exportStar(require("./attribute"), exports);

package/lib/src/payload.d.ts

@@ -1,5 +1,4 @@
 import { Proposal } from "./proposal";
-import { Attribute } from "./attribute";
 import { TrafficSelector } from "./selector";
 /**
  * IKEv2 Payload Types: \
@@ -959,10 +958,10 @@ export declare class PayloadCP extends Payload {
  */
 export declare class PayloadEAP extends Payload {
     nextPayload: payloadType;
-    tlvData: Attribute;
+    eapMessage: Buffer;
     critical: boolean;
     length: number;
-    constructor(nextPayload: payloadType, tlvData: Attribute, critical?: boolean, length?: number);
+    constructor(nextPayload: payloadType, eapMessage: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an EAP Payload from a buffer
      * @param buffer

package/lib/src/payload.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.payloadTypeMapping = exports.PayloadEAP = exports.PayloadCP = exports.cfgType = exports.PayloadSK = exports.PayloadTSr = exports.PayloadTSi = exports.PayloadTS = exports.PayloadVENDOR = exports.PayloadDELETE = exports.PayloadNOTIFY = exports.notifyMessageType = exports.securityProtocolId = exports.PayloadNONCE = exports.PayloadAUTH = exports.PayloadCERTREQ = exports.PayloadCERT = exports.CertificateType = exports.PayloadIDr = exports.PayloadIDi = exports.PayloadID = exports.IDType = exports.PayloadKE = exports.PayloadSA = exports.Payload = exports.payloadType = void 0;
 const proposal_1 = require("./proposal");
-const attribute_1 = require("./attribute");
 const selector_1 = require("./selector");
 /*
     IKEv2 Generic Payload Header
@@ -1593,6 +1592,9 @@ class PayloadSK extends Payload {
                 throw new Error(`Insufficient data for payload header at offset ${offset}`);
             }
             const payload = nextPayloadClass.parse(inClearData.subarray(offset, inClearData.length));
+            // Some extended types set NONE in type from the constructor on parse, when there are multiple types with the same
+            // encoding - e.g. PayloadID with IDi and IDr
+            payload.type = nextPayload;
             payloads.push(payload);
             offset += payload.length;
             nextPayload = payload.nextPayload;
@@ -1746,10 +1748,10 @@ exports.PayloadCP = PayloadCP;
  * @extends Payload
  */
 class PayloadEAP extends Payload {
-    constructor(nextPayload, tlvData, critical = false, length = 0) {
-        super(payloadType.EAP, nextPayload, critical, length > 0 ? length : 4 + tlvData.length);
+    constructor(nextPayload, eapMessage, critical = false, length = 0) {
+        super(payloadType.EAP, nextPayload, critical, length > 0 ? length : 4 + eapMessage.length);
         this.nextPayload = nextPayload;
-        this.tlvData = tlvData;
+        this.eapMessage = eapMessage;
         this.critical = critical;
         this.length = length;
     }
@@ -1762,8 +1764,8 @@ class PayloadEAP extends Payload {
      */
     static parse(buffer) {
         const genericPayload = Payload.parse(buffer);
-        const tlvData = attribute_1.Attribute.parse(buffer.subarray(4, genericPayload.length));
-        return new PayloadEAP(genericPayload.nextPayload, tlvData, genericPayload.critical, genericPayload.length);
+        const eapMessage = buffer.subarray(4, genericPayload.length);
+        return new PayloadEAP(genericPayload.nextPayload, eapMessage, genericPayload.critical, genericPayload.length);
     }
     /**
      * Serializes a JSON representation of the EAP payload to a buffer
@@ -1776,8 +1778,7 @@ class PayloadEAP extends Payload {
         const buffer = Buffer.alloc(json.length);
         const genericPayload = Payload.serializeJSON(json);
         genericPayload.copy(buffer);
-        const tlvDataBuffer = attribute_1.Attribute.serializeJSON(json.tlvData);
-        tlvDataBuffer.copy(buffer, 4);
+        Buffer.from(json.eapMessage, "hex").copy(buffer, 4);
         return buffer;
     }
     /**
@@ -1786,13 +1787,11 @@ class PayloadEAP extends Payload {
      * @returns {Buffer}
      */
     serialize() {
-        // Encode deep first to calculate length
-        const tlvDataBuffer = this.tlvData.serialize();
         // Fix the length
-        this.length = 4 + tlvDataBuffer.length;
+        this.length = 4 + this.eapMessage.length;
         const buffer = Buffer.alloc(this.length);
         super.serialize().copy(buffer);
-        tlvDataBuffer.copy(buffer, 4);
+        this.eapMessage.copy(buffer, 4);
         return buffer;
     }
     /**
@@ -1802,7 +1801,7 @@ class PayloadEAP extends Payload {
      */
     toJSON() {
         const json = super.genToJSON();
-        json.tlvData = this.tlvData.toJSON();
+        json.eapMessage = this.eapMessage.toString("hex");
         return json;
     }
     /**
@@ -1812,7 +1811,7 @@ class PayloadEAP extends Payload {
      */
     toString() {
         const genericString = super.genToString();
-        return `${genericString}\ntlvData: ${this.tlvData.toString()}`;
+        return `${genericString}\neapMessage: ${this.eapMessage.toString("hex")}`;
     }
 }
 exports.PayloadEAP = PayloadEAP;

package/package.json

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