Use DataModel::Provider provided command information to handle command validation

src/app/CommandHandlerImpl.cpp

@@ -524,9 +524,7 @@ Status CommandHandlerImpl::ProcessGroupCommandDataIB(CommandDataIB::Parser & aCo
             Status preCheckStatus = mpCallback->ValidateCommandCanBeDispatched(request);
             if (preCheckStatus != Status::Success)
             {
-                // NOTE: an expected error is CHIP_ERROR_ACCESS_DENIED, but there could be other unexpected errors;
-                // therefore, keep processing subsequent commands, and if any errors continue, those subsequent
-                // commands will likewise fail.
+                // Command failed for a specific path, keep trying the rest of the commands still
                 continue;
             }
         }

src/app/InteractionModelEngine.cpp

@@ -1685,22 +1685,22 @@ void InteractionModelEngine::DispatchCommand(CommandHandlerImpl & apCommandObj,
 Protocols::InteractionModel::Status InteractionModelEngine::ValidateCommandCanBeDispatched(const DataModel::InvokeRequest & request)
 {
 
-    Status status = CommandCheckExists(request.path);
+    Status status = CheckCommandExistence(request.path);
 
     if (status != Status::Success)
     {
-        ChipLogDetail(DataManagement, "No command " ChipLogFormatMEI " in Cluster " ChipLogFormatMEI " on Endpoint 0x%x",
+        ChipLogDetail(DataManagement, "No command " ChipLogFormatMEI " in Cluster " ChipLogFormatMEI " on Endpoint %u",
                       ChipLogValueMEI(request.path.mCommandId), ChipLogValueMEI(request.path.mClusterId), request.path.mEndpointId);
         return status;
     }
 
-    status = CommandCheckACL(request);
+    status = CheckCommandAccess(request);
     VerifyOrReturnValue(status == Status::Success, status);
 
-    return CommandCheckFlags(request);
+    return CheckCommandFlags(request);
 }
 
-Protocols::InteractionModel::Status InteractionModelEngine::CommandCheckACL(const DataModel::InvokeRequest & aRequest)
+Protocols::InteractionModel::Status InteractionModelEngine::CheckCommandAccess(const DataModel::InvokeRequest & aRequest)
 {
     if (!aRequest.subjectDescriptor.has_value())
     {
@@ -1713,10 +1713,8 @@ Protocols::InteractionModel::Status InteractionModelEngine::CommandCheckACL(cons
                                      .entityId    = aRequest.path.mCommandId };
 #if CHIP_CONFIG_USE_DATA_MODEL_INTERFACE
     std::optional<DataModel::CommandInfo> commandInfo = mDataModelProvider->GetAcceptedCommandInfo(aRequest.path);
-    // This is checked by previous validations, so it should not happen
-    VerifyOrReturnValue(commandInfo.has_value(), Status::UnsupportedCommand);
-
-    Access::Privilege minimumRequiredPrivilege = commandInfo->invokePrivilege;
+    Access::Privilege minimumRequiredPrivilege =
+        commandInfo.has_value() ? commandInfo->invokePrivilege : Access::Privilege::kOperate;
 #else
     Access::Privilege minimumRequiredPrivilege = RequiredPrivilege::ForInvokeCommand(aRequest.path);
 #endif
@@ -1733,12 +1731,12 @@ Protocols::InteractionModel::Status InteractionModelEngine::CommandCheckACL(cons
     return Status::Success;
 }
 
-Protocols::InteractionModel::Status InteractionModelEngine::CommandCheckFlags(const DataModel::InvokeRequest & aRequest)
+Protocols::InteractionModel::Status InteractionModelEngine::CheckCommandFlags(const DataModel::InvokeRequest & aRequest)
 {
 #if CHIP_CONFIG_USE_DATA_MODEL_INTERFACE
     std::optional<DataModel::CommandInfo> commandInfo = mDataModelProvider->GetAcceptedCommandInfo(aRequest.path);
     // This is checked by previous validations, so it should not happen
-    VerifyOrReturnValue(commandInfo.has_value(), Status::UnsupportedCommand);
+    VerifyOrDie(commandInfo.has_value());
 
     const bool commandNeedsTimedInvoke = commandInfo->flags.Has(DataModel::CommandQualityFlags::kTimed);
     const bool commandIsFabricScoped   = commandInfo->flags.Has(DataModel::CommandQualityFlags::kFabricScoped);
@@ -1768,7 +1766,7 @@ Protocols::InteractionModel::Status InteractionModelEngine::CommandCheckFlags(co
     return Status::Success;
 }
 
-Protocols::InteractionModel::Status InteractionModelEngine::CommandCheckExists(const ConcreteCommandPath & aCommandPath)
+Protocols::InteractionModel::Status InteractionModelEngine::CheckCommandExistence(const ConcreteCommandPath & aCommandPath)
 {
 #if CHIP_CONFIG_USE_DATA_MODEL_INTERFACE
     auto provider = GetDataModelProvider();

src/app/InteractionModelEngine.h

@@ -613,9 +613,9 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
     void ShutdownMatchingSubscriptions(const Optional<FabricIndex> & aFabricIndex = NullOptional,
                                        const Optional<NodeId> & aPeerNodeId       = NullOptional);
 
-    Status CommandCheckExists(const ConcreteCommandPath & aCommandPath);
-    Status CommandCheckACL(const DataModel::InvokeRequest & aRequest);
-    Status CommandCheckFlags(const DataModel::InvokeRequest & aRequest);
+    Status CheckCommandExistence(const ConcreteCommandPath & aCommandPath);
+    Status CheckCommandAccess(const DataModel::InvokeRequest & aRequest);
+    Status CheckCommandFlags(const DataModel::InvokeRequest & aRequest);
 
     /**
      * Check if the given attribute path is a valid path in the data model provider.

src/test_driver/linux-cirque/MobileDeviceTest.py

@@ -126,7 +126,7 @@ def run_controller_test(self):
                 "Toggle ep1 on/off from state 0 to 1",
                 "Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0000",
                 "Toggle ep1 on/off from state 1 to 0",
-                "No command 0x0000_0001 in Cluster 0x0000_0006 on Endpoint 0xe9"]),
+                "No command 0x0000_0001 in Cluster 0x0000_0006 on Endpoint 233"]),
                 "Datamodel test failed: cannot find matching string from device {}".format(device_id))