Add constraint enforcement on responseTimeoutSeconds in commissioner …

…control cluster (#34982) * Add constraint enforcement on responseTimeoutSeconds This adds constraints in the implementation and also fixes up error codes in CCTRL_2_2 test. * Fix comment
project-chip · Feb 3, 2025 · 69a8225 · 69a8225
1 parent b744b8f
commit 69a8225
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp b/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp
@@ -216,6 +216,14 @@ bool emberAfCommissionerControlClusterCommissionNodeCallback(
 
     auto sourceNodeId = GetNodeId(commandObj);
 
+    // Constraint on responseTimeoutSeconds is [30; 120] seconds
+    if ((commandData.responseTimeoutSeconds < 30) || (commandData.responseTimeoutSeconds > 120))
+    {
+        ChipLogError(Zcl, "Invalid responseTimeoutSeconds for CommissionNode.");
+        commandObj->AddStatus(commandPath, Status::ConstraintError);
+        return true;
+    }
+
     // Check if the command is executed via a CASE session
     if (sourceNodeId == kUndefinedNodeId)
     {

diff --git a/src/python_testing/TC_CCTRL_2_2.py b/src/python_testing/TC_CCTRL_2_2.py
@@ -217,15 +217,15 @@ async def test_TC_CCTRL_2_2(self):
             await self.send_single_cmd(cmd=cmd)
             asserts.fail("Unexpected success on CommissionNode")
         except InteractionModelError as e:
-            asserts.assert_equal(e.status, Status.Failure, "Incorrect error returned")
+            asserts.assert_equal(e.status, Status.ConstraintError, "Incorrect error returned")
 
         self.step(16)
         cmd = Clusters.CommissionerControl.Commands.CommissionNode(requestId=good_request_id, responseTimeoutSeconds=121)
         try:
             await self.send_single_cmd(cmd=cmd)
             asserts.fail("Unexpected success on CommissionNode")
         except InteractionModelError as e:
-            asserts.assert_equal(e.status, Status.Failure, "Incorrect error returned")
+            asserts.assert_equal(e.status, Status.ConstraintError, "Incorrect error returned")
 
         self.step(17)
         cmd = Clusters.CommissionerControl.Commands.CommissionNode(requestId=good_request_id, responseTimeoutSeconds=30)