Merge 6b0d364 into 0b39d3b

project-chip · Jul 2, 2024 · 1381724 · 1381724
2 parents 0b39d3b + 6b0d364
commit 1381724
Show file tree

Hide file tree

Showing 2 changed files with 210 additions and 2 deletions.
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -995,7 +995,16 @@ void DoorLockServer::setWeekDayScheduleCommandHandler(chip::app::CommandHandler
         return;
     }
 
-    if (!userExists(endpointId, userIndex))
+    EmberAfPluginDoorLockUserInfo user;
+    if (!emberAfPluginDoorLockGetUser(endpointId, userIndex, user))
+    {
+        ChipLogError(Zcl, "[SetWeekDaySchedule] Unable to get the user - internal error [endpointId=%d,userIndex=%d]", endpointId,
+                     userIndex);
+        commandObj->AddStatus(commandPath, Status::Failure);
+        return;
+    }
+
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         ChipLogProgress(Zcl,
                         "[SetWeekDaySchedule] Unable to add schedule - user does not exist "
@@ -1005,6 +1014,17 @@ void DoorLockServer::setWeekDayScheduleCommandHandler(chip::app::CommandHandler
         return;
     }
 
+    // Return INVALID_COMMAND if accessing FabricIndex does not match CreatorFabricIndex of User
+    if (user.createdBy != fabricIdx)
+    {
+        ChipLogProgress(Zcl,
+                        "[SetWeekDaySchedule] Unable to add schedule to user created by different fabric "
+                        "[endpointId=%d,userIndex=%d,creatorIdx=%d,fabricIdx=%d]",
+                        endpointId, userIndex, user.createdBy, fabricIdx);
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return;
+    }
+
     uint8_t rawDaysMask = daysMask.Raw();
 
     // Check that bits are within range
@@ -1056,6 +1076,15 @@ void DoorLockServer::setWeekDayScheduleCommandHandler(chip::app::CommandHandler
                     "[endpointId=%d,weekDayIndex=%d,userIndex=%d,daysMask=%d,startTime=\"%d:%d\",endTime=\"%d:%d\"]",
                     endpointId, weekDayIndex, userIndex, daysMask.Raw(), startHour, startMinute, endHour, endMinute);
 
+    // Update LastModifiedFabricIndex of user
+    if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, user.createdBy, fabricIdx, user.userName, user.userUniqueId,
+                                      user.userStatus, user.userType, user.credentialRule, user.credentials.data(),
+                                      user.credentials.size()))
+    {
+        ChipLogError(Zcl, "[SetWeekDaySchedule] Unable to update user - internal error [endpointId=%d,fabricIndex=%d,userIndex=%d]",
+                     endpointId, fabricIdx, userIndex);
+    }
+
     sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kWeekDaySchedule, DataOperationTypeEnum::kAdd, sourceNodeId, fabricIdx,
                              userIndex, static_cast<uint16_t>(weekDayIndex));
 
@@ -1220,7 +1249,16 @@ void DoorLockServer::setYearDayScheduleCommandHandler(chip::app::CommandHandler
         return;
     }
 
-    if (!userExists(endpointId, userIndex))
+    EmberAfPluginDoorLockUserInfo user;
+    if (!emberAfPluginDoorLockGetUser(endpointId, userIndex, user))
+    {
+        ChipLogError(Zcl, "[SetYearDaySchedule] Unable to get the user - internal error [endpointId=%d,userIndex=%d]", endpointId,
+                     userIndex);
+        commandObj->AddStatus(commandPath, Status::Failure);
+        return;
+    }
+
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         ChipLogProgress(Zcl,
                         "[SetYearDaySchedule] Unable to add schedule - user does not exist "
@@ -1230,6 +1268,17 @@ void DoorLockServer::setYearDayScheduleCommandHandler(chip::app::CommandHandler
         return;
     }
 
+    // Return INVALID_COMMAND if accessing FabricIndex does not match CreatorFabricIndex of User
+    if (user.createdBy != fabricIdx)
+    {
+        ChipLogProgress(Zcl,
+                        "[SetYearDaySchedule] Unable to add schedule to user created by different fabric "
+                        "[endpointId=%d,userIndex=%d,creatorIdx=%d,fabricIdx=%d]",
+                        endpointId, userIndex, user.createdBy, fabricIdx);
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return;
+    }
+
     if (localEndTime <= localStartTime)
     {
         ChipLogProgress(Zcl,
@@ -1257,6 +1306,15 @@ void DoorLockServer::setYearDayScheduleCommandHandler(chip::app::CommandHandler
                     "[endpointId=%d,yearDayIndex=%d,userIndex=%d,localStartTime=%" PRIu32 ",endTime=%" PRIu32 "]",
                     endpointId, yearDayIndex, userIndex, localStartTime, localEndTime);
 
+    // Update LastModifiedFabricIndex of user
+    if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, user.createdBy, fabricIdx, user.userName, user.userUniqueId,
+                                      user.userStatus, user.userType, user.credentialRule, user.credentials.data(),
+                                      user.credentials.size()))
+    {
+        ChipLogError(Zcl, "[SetYearDaySchedule] Unable to update user - internal error [endpointId=%d,fabricIndex=%d,userIndex=%d]",
+                     endpointId, fabricIdx, userIndex);
+    }
+
     sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kYearDaySchedule, DataOperationTypeEnum::kAdd, sourceNodeId, fabricIdx,
                              userIndex, static_cast<uint16_t>(yearDayIndex));
 

diff --git a/src/app/tests/suites/DL_Schedules.yaml b/src/app/tests/suites/DL_Schedules.yaml
@@ -18,6 +18,18 @@ config:
     nodeId: 0x12344321
     cluster: "Door Lock"
     endpoint: 1
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
+    discriminator:
+        type: int16u
+        defaultValue: 3840
+    waitAfterCommissioning:
+        type: int16u
+        defaultValue: 1000
+    PakeVerifier:
+        type: octet_string
+        defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
@@ -86,6 +98,57 @@ tests:
           saveAs: NumberOfHolidaySchedulesSupportedValue
           value: 10
 
+    #
+    # Commission to second fabric to facilitate testing schedule/fabric restrictions
+    #
+    - label: "Open Commissioning Window from alpha"
+      endpoint: 0
+      cluster: "Administrator Commissioning"
+      command: "OpenCommissioningWindow"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "CommissioningTimeout"
+                value: 180
+              - name: "PAKEPasscodeVerifier"
+                value: PakeVerifier
+              - name: "Discriminator"
+                value: discriminator
+              - name: "Iterations"
+                value: 1000
+              - name: "Salt"
+                value: "SPAKE2P Key Salt"
+
+    - label: "Waiting after opening commissioning window"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: waitAfterCommissioning
+
+    - label: "Commission from TH2"
+      identity: "beta"
+      endpoint: 0
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Wait for the commissioned device to be retrieved for TH2"
+      endpoint: 0
+      identity: beta
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
     #
     # Excercise SetWeekDay schedules with invalid parameters
     #
@@ -885,6 +948,93 @@ tests:
               - name: "LocalEndTime"
                 value: 12345689
 
+    # Verify that schedule modification fails from different fabric than created user
+    - label: "Attempt to set Week Day schedule from different fabric"
+      command: "SetWeekDaySchedule"
+      identity: "beta"
+      arguments:
+          values:
+              - name: "WeekDayIndex"
+                value: 1
+              - name: "UserIndex"
+                value: 1
+              - name: "DaysMask"
+                value: 0x01
+              - name: "StartHour"
+                value: 14
+              - name: "StartMinute"
+                value: 15
+              - name: "EndHour"
+                value: 19
+              - name: "EndMinute"
+                value: 00
+      response:
+          error: INVALID_COMMAND
+
+    - label: "Verify schedule was not modified"
+      command: "GetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "WeekDayIndex"
+                value: 1
+              - name: "UserIndex"
+                value: 1
+      response:
+          values:
+              - name: "WeekDayIndex"
+                value: 1
+              - name: "UserIndex"
+                value: 1
+              - name: "Status"
+                value: 0x0
+              - name: "DaysMask"
+                value: 0x01
+              - name: "StartHour"
+                value: 15
+              - name: "StartMinute"
+                value: 16
+              - name: "EndHour"
+                value: 18
+              - name: "EndMinute"
+                value: 00
+
+    - label: "Attempt to set Year Day schedule from different fabric"
+      command: "SetYearDaySchedule"
+      identity: "beta"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 1
+              - name: "UserIndex"
+                value: 1
+              - name: "LocalStartTime"
+                value: 12356
+              - name: "LocalEndTime"
+                value: 12345765
+      response:
+          error: INVALID_COMMAND
+
+    - label: "Verify schedule was not modified"
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 1
+              - name: "UserIndex"
+                value: 1
+      response:
+          values:
+              - name: "YearDayIndex"
+                value: 1
+              - name: "UserIndex"
+                value: 1
+              - name: "Status"
+                value: 0x0
+              - name: "LocalStartTime"
+                value: 12345
+              - name: "LocalEndTime"
+                value: 12345689
+
     #
     # Excercise ClearWeekDay schedules with invalid parameters
     #