add monitor subject check for subscription activation

If caseTag for current subscription does not match with the one set in ICDManagementCluster::RegisterClient for check-in,
when receiving check-in message, OnActiveModeNotification would do nothing for current subscription.

Author: yunhanw-google

src/app/InteractionModelEngine.cpp

@@ -1069,14 +1069,18 @@ void InteractionModelEngine::OnResponseTimeout(Messaging::ExchangeContext * ec)
 }
 
 #if CHIP_CONFIG_ENABLE_READ_CLIENT
-void InteractionModelEngine::OnActiveModeNotification(ScopedNodeId aPeer)
+void InteractionModelEngine::OnActiveModeNotification(ScopedNodeId aPeer, uint64_t aMonitoredSubject)
 {
     for (ReadClient * pListItem = mpActiveReadClientList; pListItem != nullptr;)
     {
         auto pNextItem = pListItem->GetNextClient();
         // It is possible that pListItem is destroyed by the app in OnActiveModeNotification.
         // Get the next item before invoking `OnActiveModeNotification`.
-        if (ScopedNodeId(pListItem->GetPeerNodeId(), pListItem->GetFabricIndex()) == aPeer)
+        // If caseTag for current subscription does not match with the one set in ICDManagementCluster::RegisterClient for check-in,
+        // when receiving check-in message, OnActiveModeNotification would do nothing for current subscription.
+        if (ScopedNodeId(pListItem->GetPeerNodeId(), pListItem->GetFabricIndex()) == aPeer &&
+           pListItem->GetSubjectDescriptor().HasValue() && pListItem->GetSubjectDescriptor().cats.CheckSubjectAgainstCATs(aMonitoredSubject) &&
+           pListItem->GetSubjectDescriptor().subject == aMonitoredSubject)
         {
             pListItem->OnActiveModeNotification();
         }

src/app/InteractionModelEngine.h

@@ -238,7 +238,7 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
      *
      *  See ReadClient::OnActiveModeNotification
      */
-    void OnActiveModeNotification(ScopedNodeId aPeer);
+    void OnActiveModeNotification(ScopedNodeId aPeer, uint64_t aMonitoredSubject);
 
     /**
      *  Used to notify when a peer becomes LIT ICD or vice versa.

src/app/ReadClient.h

@@ -509,6 +509,12 @@ class ReadClient : public Messaging::ExchangeDelegate
      */
     Optional<System::Clock::Timeout> GetSubscriptionTimeout();
 
+    Optional<Access::SubjectDescriptor> GetSubjectDescriptor() const
+    {
+        VerifyOrReturnValue(mReadPrepareParams.mSessionHolder, NullOptional);
+        return MakeOptional(mReadPrepareParams.mSessionHolder->AsSecureSession()->GetSubjectDescriptor());
+    }
+
 private:
     friend class TestReadInteraction;
     friend class InteractionModelEngine;

src/app/icd/client/CheckInHandler.cpp

@@ -138,7 +138,7 @@ CHIP_ERROR CheckInHandler::OnMessageReceived(Messaging::ExchangeContext * ec, co
         mpICDClientStorage->StoreEntry(clientInfo);
         mpCheckInDelegate->OnCheckInComplete(clientInfo);
 #if CHIP_CONFIG_ENABLE_READ_CLIENT
-        mpImEngine->OnActiveModeNotification(clientInfo.peer_node);
+        mpImEngine->OnActiveModeNotification(clientInfo.peer_node, clientInfo.monitored_subject);
 #endif // CHIP_CONFIG_ENABLE_READ_CLIENT
     }
 

src/app/icd/client/RefreshKeySender.cpp

@@ -69,7 +69,7 @@ CHIP_ERROR RefreshKeySender::RegisterClientWithNewKey(Messaging::ExchangeManager
 
         mpCheckInDelegate->OnCheckInComplete(mICDClientInfo);
 #if CHIP_CONFIG_ENABLE_READ_CLIENT
-        mpImEngine->OnActiveModeNotification(mICDClientInfo.peer_node);
+        mpImEngine->OnActiveModeNotification(mICDClientInfo.peer_node, mICDClientInfo.monitored_subject);
 #endif // CHIP_CONFIG_ENABLE_READ_CLIENT
         mpCheckInDelegate->OnKeyRefreshDone(this, CHIP_NO_ERROR);
     };

src/controller/tests/data_model/TestRead.cpp

@@ -2330,7 +2330,7 @@ TEST_F(TestRead, TestSubscribe_OnActiveModeNotification)
         GetLoopback().mNumMessagesToDrop = 0;
         callback.ClearCounters();
         InteractionModelEngine::GetInstance()->OnActiveModeNotification(
-            ScopedNodeId(readClient.GetPeerNodeId(), readClient.GetFabricIndex()));
+            ScopedNodeId(readClient.GetPeerNodeId(), readClient.GetFabricIndex()), readClient.GetSubjectDescriptor().Value().subject);
         EXPECT_EQ(callback.mOnResubscriptionsAttempted, 1);
         EXPECT_EQ(callback.mLastError, CHIP_ERROR_TIMEOUT);
 
@@ -2393,7 +2393,7 @@ TEST_F(TestRead, TestSubscribeFailed_OnActiveModeNotification)
         GetLoopback().mNumMessagesToDrop = 0;
         callback.ClearCounters();
         InteractionModelEngine::GetInstance()->OnActiveModeNotification(
-            ScopedNodeId(readClient.GetPeerNodeId(), readClient.GetFabricIndex()));
+            ScopedNodeId(readClient.GetPeerNodeId(), readClient.GetFabricIndex()), readClient.GetSubjectDescriptor().Value().subject);
         //
         // Drive servicing IO till we have established a subscription.
         //