@zwave-js/cc 10.0.0-beta.5 → 10.0.0-beta.8

package/build/cc/ProtectionCC.d.ts

@@ -22,10 +22,10 @@ export declare const ProtectionCCValues: Readonly<{
             readonly writeable: true;
         };
         readonly options: {
-            readonly supportsEndpoints: true;
             readonly minVersion: 1;
             readonly stateful: true;
             readonly secret: false;
+            readonly supportsEndpoints: true;
             readonly autoCreate: true;
             readonly internal: true;
         };
@@ -47,10 +47,10 @@ export declare const ProtectionCCValues: Readonly<{
             readonly writeable: true;
         };
         readonly options: {
-            readonly supportsEndpoints: true;
             readonly minVersion: 1;
             readonly stateful: true;
             readonly secret: false;
+            readonly supportsEndpoints: true;
             readonly autoCreate: true;
             readonly internal: true;
         };
@@ -72,10 +72,10 @@ export declare const ProtectionCCValues: Readonly<{
             readonly writeable: true;
         };
         readonly options: {
-            readonly supportsEndpoints: true;
             readonly minVersion: 1;
             readonly stateful: true;
             readonly secret: false;
+            readonly supportsEndpoints: true;
             readonly autoCreate: true;
             readonly internal: true;
         };
@@ -97,10 +97,10 @@ export declare const ProtectionCCValues: Readonly<{
             readonly writeable: true;
         };
         readonly options: {
-            readonly supportsEndpoints: true;
             readonly minVersion: 1;
             readonly stateful: true;
             readonly secret: false;
+            readonly supportsEndpoints: true;
             readonly autoCreate: true;
             readonly internal: true;
         };
@@ -126,9 +126,9 @@ export declare const ProtectionCCValues: Readonly<{
         };
         readonly options: {
             readonly internal: false;
-            readonly supportsEndpoints: true;
             readonly stateful: true;
             readonly secret: false;
+            readonly supportsEndpoints: true;
             readonly autoCreate: true;
             readonly minVersion: 2;
         };
@@ -155,9 +155,9 @@ export declare const ProtectionCCValues: Readonly<{
         };
         readonly options: {
             readonly internal: false;
-            readonly supportsEndpoints: true;
             readonly stateful: true;
             readonly secret: false;
+            readonly supportsEndpoints: true;
             readonly autoCreate: true;
             readonly minVersion: 2;
         };
@@ -212,9 +212,9 @@ export declare const ProtectionCCValues: Readonly<{
         };
         readonly options: {
             readonly internal: false;
-            readonly supportsEndpoints: true;
             readonly stateful: true;
             readonly secret: false;
+            readonly supportsEndpoints: true;
             readonly autoCreate: true;
             readonly minVersion: 2;
         };

package/build/cc/SceneActivationCC.d.ts

@@ -54,9 +54,9 @@ export declare const SceneActivationCCValues: Readonly<{
         };
         readonly options: {
             readonly internal: false;
-            readonly supportsEndpoints: true;
             readonly minVersion: 1;
             readonly secret: false;
+            readonly supportsEndpoints: true;
             readonly autoCreate: true;
             readonly stateful: false;
         };

package/build/cc/Security2CC.d.ts

@@ -49,7 +49,8 @@ export declare class Security2CCMessageEncapsulation extends Security2CC {
     };
     constructor(host: ZWaveHost, options: CommandClassDeserializationOptions | Security2CCMessageEncapsulationOptions);
     private _securityClass?;
-    readonly decryptionKey?: Buffer;
+    private key?;
+    private iv?;
     private _sequenceNumber;
     /**
      * Return the sequence number of this command.

package/build/cc/Security2CC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Security2CC.d.ts","sourceRoot":"","sources":["../../src/cc/Security2CC.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Security2CC.d.ts","sourceRoot":"","sources":["../../src/cc/Security2CC.ts"],"names":[],"mappings":"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"}

package/build/cc/Security2CC.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Security2CCCommandsSupportedGet = exports.Security2CCCommandsSupportedReport = exports.Security2CCTransferEnd = exports.Security2CCNetworkKeyVerify = exports.Security2CCNetworkKeyGet = exports.Security2CCNetworkKeyReport = exports.Security2CCPublicKeyReport = exports.Security2CCKEXFail = exports.Security2CCKEXSet = exports.Security2CCKEXGet = exports.Security2CCKEXReport = exports.Security2CCNonceGet = exports.Security2CCNonceReport = exports.Security2CCMessageEncapsulation = exports.Security2CC = exports.Security2CCAPI = void 0;
 const core_1 = require("@zwave-js/core");
 const safe_1 = require("@zwave-js/core/safe");
-const serial_1 = require("@zwave-js/serial");
 const safe_2 = require("@zwave-js/shared/safe");
 const API_1 = require("../lib/API");
 const CommandClass_1 = require("../lib/CommandClass");
@@ -37,15 +36,14 @@ function getAuthenticationData(sendingNodeId, destination, homeId, commandLength
     unencryptedPayload.copy(ret, 8, 0);
     return ret;
 }
-/** Validates that a sequence number is not a duplicate and updates the SPAN table if it is accepted */
+/** Validates that a sequence number is not a duplicate and updates the SPAN table if it is accepted. Returns the previous sequence number if there is one. */
 function validateSequenceNumber(sequenceNumber) {
-    const peerNodeID = this.nodeId;
-    core_1.validatePayload.withReason("Duplicate command")(!this.host.securityManager2.isDuplicateSinglecast(peerNodeID, sequenceNumber));
+    core_1.validatePayload.withReason("Duplicate command")(!this.host.securityManager2.isDuplicateSinglecast(this.nodeId, sequenceNumber));
     // Not a duplicate, store it
-    this.host.securityManager2.storeSequenceNumber(peerNodeID, sequenceNumber);
+    return this.host.securityManager2.storeSequenceNumber(this.nodeId, sequenceNumber);
 }
 function assertSecurity(options) {
-    const verb = (0, serial_1.gotDeserializationOptions)(options) ? "decoded" : "sent";
+    const verb = (0, CommandClass_1.gotDeserializationOptions)(options) ? "decoded" : "sent";
     if (!this.host.ownNodeId) {
         throw new core_1.ZWaveError(`Secure commands (S2) can only be ${verb} when the controller's node id is known!`, core_1.ZWaveErrorCodes.Driver_NotReady);
     }
@@ -410,18 +408,18 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
         super(host, options);
         // Make sure that we can send/receive secure commands
         assertSecurity.call(this, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 2);
             // Check the sequence number to avoid duplicates
             // TODO: distinguish between multicast and singlecast
             this._sequenceNumber = this.payload[0];
+            const sendingNodeId = this.nodeId;
             // Don't accept duplicate commands
-            validateSequenceNumber.call(this, this._sequenceNumber);
+            const prevSequenceNumber = validateSequenceNumber.call(this, this._sequenceNumber);
             // Ensure the node has a security class
-            const peerNodeID = this.nodeId;
             // const node = this.getNode()!;
             // validatePayload.withReason("The node is not included")(!!node);
-            const securityClass = this.host.getHighestSecurityClass(peerNodeID);
+            const securityClass = this.host.getHighestSecurityClass(sendingNodeId);
             core_1.validatePayload.withReason("No security class granted")(securityClass !== core_1.SecurityClass.None);
             const hasExtensions = !!(this.payload[1] & 0b1);
             const hasEncryptedExtensions = !!(this.payload[1] & 0b10);
@@ -447,9 +445,9 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
             const ciphertext = this.payload.slice(offset, -core_1.SECURITY_S2_AUTH_TAG_LENGTH);
             const authTag = this.payload.slice(-core_1.SECURITY_S2_AUTH_TAG_LENGTH);
             const messageLength = super.computeEncapsulationOverhead() + this.payload.length;
-            const authData = getAuthenticationData(this.nodeId, this.getDestinationIDRX(), this.host.homeId, messageLength, unencryptedPayload);
+            const authData = getAuthenticationData(sendingNodeId, this.getDestinationIDRX(), this.host.homeId, messageLength, unencryptedPayload);
             // Decrypt payload and verify integrity
-            const spanState = this.host.securityManager2.getSPANState(peerNodeID);
+            const spanState = this.host.securityManager2.getSPANState(sendingNodeId);
             const failNoSPAN = () => {
                 return core_1.validatePayload.fail(core_1.ZWaveErrorCodes.Security2CC_NoSPAN);
             };
@@ -463,15 +461,43 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
                 return failNoSPAN();
             }
             const decrypt = () => {
-                const getNonceAndDecrypt = () => {
-                    const iv = this.host.securityManager2.nextNonce(peerNodeID);
-                    const { keyCCM: key } = this.host.securityManager2.getKeysForNode(peerNodeID);
+                const decryptWithNonce = (nonce) => {
+                    const { keyCCM: key } = this.host.securityManager2.getKeysForNode(sendingNodeId);
+                    const iv = nonce;
                     return {
-                        decryptionKey: key,
+                        key,
+                        iv,
                         ...(0, core_1.decryptAES128CCM)(key, iv, ciphertext, authData, authTag),
                     };
                 };
+                const getNonceAndDecrypt = () => {
+                    const iv = this.host.securityManager2.nextNonce(sendingNodeId);
+                    return decryptWithNonce(iv);
+                };
                 if (spanState.type === core_1.SPANState.SPAN) {
+                    // There SHOULD be a shared SPAN between both parties. But experience has shown that both could have
+                    // sent a command at roughly the same time, using the same SPAN for encryption.
+                    // To avoid a nasty desync and both nodes trying to resync at the same time, causing message loss,
+                    // we accept commands encrypted with the previous SPAN under very specific circumstances:
+                    if (
+                    // The previous SPAN is still known, i.e. the node didn't send another command that was successfully decrypted
+                    !!spanState.currentSPAN &&
+                        // it is still valid
+                        spanState.currentSPAN.expires > (0, core_1.highResTimestamp)() &&
+                        // The received command is exactly the next, expected one
+                        prevSequenceNumber != undefined &&
+                        this._sequenceNumber ===
+                            ((prevSequenceNumber + 1) & 0xff) &&
+                        // And in case of a mock-based test, do this only on the controller
+                        !this.host.__internalIsMockNode) {
+                        const nonce = spanState.currentSPAN.nonce;
+                        spanState.currentSPAN = undefined;
+                        return decryptWithNonce(nonce);
+                    }
+                    else {
+                        // forgetting the current SPAN shouldn't be necessary but better be safe than sorry
+                        spanState.currentSPAN = undefined;
+                    }
                     // This can only happen if the security class is known
                     return getNonceAndDecrypt();
                 }
@@ -483,18 +509,18 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
                         return failNoSPAN();
                     const receiverEI = spanState.receiverEI;
                     // How we do this depends on whether we know the security class of the other node
-                    if (this.host.securityManager2.tempKeys.has(peerNodeID)) {
+                    if (this.host.securityManager2.tempKeys.has(sendingNodeId)) {
                         // We're currently bootstrapping the node, it might be using a temporary key
-                        this.host.securityManager2.initializeTempSPAN(peerNodeID, senderEI, receiverEI);
+                        this.host.securityManager2.initializeTempSPAN(sendingNodeId, senderEI, receiverEI);
                         const ret = getNonceAndDecrypt();
                         // Decryption with the temporary key worked
                         if (ret.authOK)
                             return ret;
                         // Reset the SPAN state and try with the recently granted security class
-                        this.host.securityManager2.setSPANState(peerNodeID, spanState);
+                        this.host.securityManager2.setSPANState(sendingNodeId, spanState);
                     }
                     if (securityClass != undefined) {
-                        this.host.securityManager2.initializeSPAN(peerNodeID, securityClass, senderEI, receiverEI);
+                        this.host.securityManager2.initializeSPAN(sendingNodeId, securityClass, senderEI, receiverEI);
                         return getNonceAndDecrypt();
                     }
                     else {
@@ -502,18 +528,18 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
                         // Try multiple security classes
                         const possibleSecurityClasses = core_1.securityClassOrder
                             .filter((s) => (0, core_1.securityClassIsS2)(s))
-                            .filter((s) => this.host.hasSecurityClass(peerNodeID, s) !== false);
+                            .filter((s) => this.host.hasSecurityClass(sendingNodeId, s) !== false);
                         for (const secClass of possibleSecurityClasses) {
                             // Initialize an SPAN with that security class
-                            this.host.securityManager2.initializeSPAN(peerNodeID, secClass, senderEI, receiverEI);
+                            this.host.securityManager2.initializeSPAN(sendingNodeId, secClass, senderEI, receiverEI);
                             const ret = getNonceAndDecrypt();
                             // It worked, return the result and remember the security class
                             if (ret.authOK) {
-                                this.host.setSecurityClass(peerNodeID, secClass, true);
+                                this.host.setSecurityClass(sendingNodeId, secClass, true);
                                 return ret;
                             }
                             // Reset the SPAN state and try with the next security class
-                            this.host.securityManager2.setSPANState(peerNodeID, spanState);
+                            this.host.securityManager2.setSPANState(sendingNodeId, spanState);
                         }
                     }
                 }
@@ -522,12 +548,13 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
             };
             let plaintext;
             let authOK = false;
-            let decryptionKey;
+            let key;
+            let iv;
             // If the Receiver is unable to authenticate the singlecast message with the current SPAN,
             // the Receiver SHOULD try decrypting the message with one or more of the following SPAN values,
             // stopping when decryption is successful or the maximum number of iterations is reached.
             for (let i = 0; i < DECRYPT_ATTEMPTS; i++) {
-                ({ plaintext, authOK, decryptionKey } = decrypt());
+                ({ plaintext, authOK, key, iv } = decrypt());
                 if (!!authOK && !!plaintext)
                     break;
             }
@@ -551,7 +578,8 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
                     encapCC: this,
                 });
             }
-            this.decryptionKey = decryptionKey;
+            this.key = key;
+            this.iv = iv;
         }
         else {
             this._securityClass = options.securityClass;
@@ -601,9 +629,9 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
     }
     serialize() {
         // TODO: Support Multicast
-        const nodeId = this.nodeId;
         // Include Sender EI in the command if we only have the receiver's EI
-        const spanState = this.host.securityManager2.getSPANState(nodeId);
+        const receiverNodeId = this.getDestinationIDTX();
+        const spanState = this.host.securityManager2.getSPANState(receiverNodeId);
         if (spanState.type === core_1.SPANState.None ||
             spanState.type === core_1.SPANState.LocalEI) {
             // Can't do anything here if we don't have the receiver's EI
@@ -616,16 +644,16 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
             const receiverEI = spanState.receiverEI;
             // While bootstrapping a node, the controller only sends commands encrypted
             // with the temporary key
-            if (this.host.securityManager2.tempKeys.has(nodeId)) {
-                this.host.securityManager2.initializeTempSPAN(nodeId, senderEI, receiverEI);
+            if (this.host.securityManager2.tempKeys.has(receiverNodeId)) {
+                this.host.securityManager2.initializeTempSPAN(receiverNodeId, senderEI, receiverEI);
             }
             else {
                 const securityClass = this._securityClass ??
-                    this.host.getHighestSecurityClass(nodeId);
+                    this.host.getHighestSecurityClass(receiverNodeId);
                 if (securityClass == undefined) {
                     throw new core_1.ZWaveError("No security class defined for this command!", core_1.ZWaveErrorCodes.Security2CC_NoSPAN);
                 }
-                this.host.securityManager2.initializeSPAN(nodeId, securityClass, senderEI, receiverEI);
+                this.host.securityManager2.initializeSPAN(receiverNodeId, securityClass, senderEI, receiverEI);
             }
             // Add or update the SPAN extension
             let spanExtension = this.extensions.find((e) => e instanceof Extension_1.SPANExtension);
@@ -654,14 +682,19 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
         ]);
         // Generate the authentication data for CCM encryption
         const messageLength = this.computeEncapsulationOverhead() + serializedCC.length;
-        const authData = getAuthenticationData(this.host.ownNodeId, this.getDestinationIDTX(), this.host.homeId, messageLength, unencryptedPayload);
-        const iv = this.host.securityManager2.nextNonce(nodeId);
+        const authData = getAuthenticationData(this.host.ownNodeId, receiverNodeId, this.host.homeId, messageLength, unencryptedPayload);
+        // Generate a nonce for encryption, and remember it to attempt decryption
+        // of potential in-flight messages from the target node.
+        const iv = this.host.securityManager2.nextNonce(receiverNodeId, true);
         const { keyCCM: key } = 
         // Prefer the overridden security class if it was given
         this._securityClass != undefined
             ? this.host.securityManager2.getKeysForSecurityClass(this._securityClass)
-            : this.host.securityManager2.getKeysForNode(nodeId);
+            : this.host.securityManager2.getKeysForNode(receiverNodeId);
         const { ciphertext: ciphertextPayload, authTag } = (0, core_1.encryptAES128CCM)(key, iv, plaintextPayload, authData, core_1.SECURITY_S2_AUTH_TAG_LENGTH);
+        // Remember key and IV for debugging purposes
+        this.key = key;
+        this.iv = iv;
         this.payload = Buffer.concat([
             unencryptedPayload,
             ciphertextPayload,
@@ -692,6 +725,15 @@ let Security2CCMessageEncapsulation = class Security2CCMessageEncapsulation exte
                 .map((e) => e.toLogEntry())
                 .join("");
         }
+        // Log the used keys in integration tests
+        if (process.env.NODE_ENV === "test") {
+            if (this.key) {
+                message.key = (0, safe_2.buffer2hex)(this.key);
+            }
+            if (this.iv) {
+                message.IV = (0, safe_2.buffer2hex)(this.iv);
+            }
+        }
         return {
             ...super.toLogEntry(applHost),
             message,
@@ -708,7 +750,7 @@ let Security2CCNonceReport = class Security2CCNonceReport extends Security2CC {
         super(host, options);
         // Make sure that we can send/receive secure commands
         assertSecurity.call(this, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 2);
             this._sequenceNumber = this.payload[0];
             // Don't accept duplicate commands
@@ -779,7 +821,7 @@ let Security2CCNonceGet = class Security2CCNonceGet extends Security2CC {
         super(host, options);
         // Make sure that we can send/receive secure commands
         assertSecurity.call(this, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 1);
             this._sequenceNumber = this.payload[0];
             // Don't accept duplicate commands
@@ -821,7 +863,7 @@ exports.Security2CCNonceGet = Security2CCNonceGet;
 let Security2CCKEXReport = class Security2CCKEXReport extends Security2CC {
     constructor(host, options) {
         super(host, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 4);
             this.requestCSA = !!(this.payload[0] & 0b10);
             this.echo = !!(this.payload[0] & 0b1);
@@ -881,7 +923,7 @@ exports.Security2CCKEXGet = Security2CCKEXGet;
 let Security2CCKEXSet = class Security2CCKEXSet extends Security2CC {
     constructor(host, options) {
         super(host, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 4);
             this.permitCSA = !!(this.payload[0] & 0b10);
             this.echo = !!(this.payload[0] & 0b1);
@@ -934,7 +976,7 @@ exports.Security2CCKEXSet = Security2CCKEXSet;
 let Security2CCKEXFail = class Security2CCKEXFail extends Security2CC {
     constructor(host, options) {
         super(host, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 1);
             this.failType = this.payload[0];
         }
@@ -960,7 +1002,7 @@ exports.Security2CCKEXFail = Security2CCKEXFail;
 let Security2CCPublicKeyReport = class Security2CCPublicKeyReport extends Security2CC {
     constructor(host, options) {
         super(host, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 17);
             this.includingNode = !!(this.payload[0] & 0b1);
             this.publicKey = this.payload.slice(1);
@@ -994,7 +1036,7 @@ exports.Security2CCPublicKeyReport = Security2CCPublicKeyReport;
 let Security2CCNetworkKeyReport = class Security2CCNetworkKeyReport extends Security2CC {
     constructor(host, options) {
         super(host, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             // TODO: Deserialize payload
             throw new core_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, core_1.ZWaveErrorCodes.Deserialization_NotImplemented);
         }
@@ -1028,7 +1070,7 @@ exports.Security2CCNetworkKeyReport = Security2CCNetworkKeyReport;
 let Security2CCNetworkKeyGet = class Security2CCNetworkKeyGet extends Security2CC {
     constructor(host, options) {
         super(host, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 1);
             this.requestedKey = bitMaskToSecurityClass(this.payload, 0);
         }
@@ -1063,7 +1105,7 @@ exports.Security2CCNetworkKeyVerify = Security2CCNetworkKeyVerify;
 let Security2CCTransferEnd = class Security2CCTransferEnd extends Security2CC {
     constructor(host, options) {
         super(host, options);
-        if ((0, serial_1.gotDeserializationOptions)(options)) {
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 1);
             this.keyVerified = !!(this.payload[0] & 0b10);
             this.keyRequestComplete = !!(this.payload[0] & 0b1);