@zwave-js/cc 15.31.1 → 15.32.0

package/build/cjs/cc/Security2CC.js

@@ -48,6 +48,7 @@ var import_CommandClassDecorators = require("../lib/CommandClassDecorators.js");
 var import_Extension = require("../lib/Security2/Extension.js");
 var import_shared2 = require("../lib/Security2/shared.js");
 var import_Types = require("../lib/_Types.js");
+var import_securityLogging = require("../lib/securityLogging.js");
 var import_CRC16CC = require("./CRC16CC.js");
 var import_MultiChannelCC = require("./MultiChannelCC.js");
 var import_SecurityCC = require("./SecurityCC.js");
@@ -898,12 +899,15 @@ let Security2CCMessageEncapsulation = (() => {
       })();
       if (mustDiscardCommand) {
         if (mcctx.isMulticast) {
-          await securityManager.nextPeerMPAN(ctx.sourceNodeId, mcctx.groupId);
-        } else {
+          securityManager.tryIncrementPeerMPAN(ctx.sourceNodeId, mcctx.groupId);
+        } else if (securityManager.getSPANState(ctx.sourceNodeId).type === import_core.SPANState.SPAN) {
           await securityManager.nextNonce(ctx.sourceNodeId);
         }
         import_core.validatePayload.fail("Invalid S2 extension");
       }
+      if (raw.payload.length < offset + SECURITY_S2_AUTH_TAG_LENGTH) {
+        import_core.validatePayload.fail(mcctx.isMulticast ? import_core.ZWaveErrorCodes.Security2CC_CannotDecodeMulticast : import_core.ZWaveErrorCodes.Security2CC_CannotDecode);
+      }
       let prevSequenceNumber;
       let mpanState;
       if (mcctx.isMulticast) {
@@ -1117,7 +1121,8 @@ let Security2CCMessageEncapsulation = (() => {
         ...encryptedExtensions.map((e, index) => e.serialize(index < encryptedExtensions.length - 1)),
         serializedCC
       ]);
-      const destinationTag = getDestinationIDTX.call(this);
+      const self = this;
+      const destinationTag = getDestinationIDTX.call(self);
       const messageLength = this.computeEncapsulationOverhead() + serializedCC.length;
       const authData = getAuthenticationData(ctx.ownNodeId, destinationTag, ctx.homeId, messageLength, unencryptedPayload);
       let key;
@@ -1155,7 +1160,7 @@ let Security2CCMessageEncapsulation = (() => {
       const message = {
         "sequence number": this.sequenceNumber ?? "(not set)"
       };
-      if ((0, import_shared.getenv)("NODE_ENV") === "test" || (0, import_shared.getenv)("NODE_ENV") === "development") {
+      if ((0, import_securityLogging.shouldLogSecurityDetails)()) {
         if (this.key) {
           message.key = (0, import_shared.buffer2hex)(this.key);
         }
@@ -1617,9 +1622,9 @@ let Security2CCPublicKeyReport = (() => {
       this.publicKey = options.publicKey;
     }
     static from(raw, ctx) {
-      (0, import_core.validatePayload)(raw.payload.length >= 17);
+      (0, import_core.validatePayload)(raw.payload.length >= 33);
       const includingNode = !!(raw.payload[0] & 1);
-      const publicKey = raw.payload.subarray(1);
+      const publicKey = raw.payload.subarray(1, 33);
       return new this({
         nodeId: ctx.sourceNodeId,
         includingNode,