[Matter.framework] Invalidate the CASE session if something calls Tri…

…ggerResubscriptionWithReason and it has not been established yet

src/app/CASESessionManager.cpp

@@ -188,6 +188,12 @@ Optional<SessionHandle> CASESessionManager::FindExistingSession(const ScopedNode
         peerId, MakeOptional(Transport::SecureSession::Type::kCASE), transportPayloadCapability);
 }
 
+void CASESessionManager::ReleaseSession(const ScopedNodeId & peerId)
+{
+    auto * session = mConfig.sessionSetupPool->FindSessionSetup(peerId, false);
+    ReleaseSession(session);
+}
+
 void CASESessionManager::ReleaseSession(OperationalSessionSetup * session)
 {
     if (session != nullptr)

src/app/CASESessionManager.h

@@ -142,6 +142,7 @@ class CASESessionManager : public OperationalSessionReleaseDelegate, public Sess
 #endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
                                 TransportPayloadCapability transportPayloadCapability = TransportPayloadCapability::kMRPPayload);
 
+    void ReleaseSession(const ScopedNodeId & peerId);
     void ReleaseSessionsForFabric(FabricIndex fabricIndex);
 
     void ReleaseAllSessions();

src/controller/CHIPDeviceController.h

@@ -204,6 +204,16 @@ class DLL_EXPORT DeviceController : public AbstractDnssdDiscoveryController
         return nullptr;
     }
 
+    CASESessionManager * CASESessionMgr()
+    {
+        if (mSystemState)
+        {
+            return mSystemState->CASESessionMgr();
+        }
+
+        return nullptr;
+    }
+
     Messaging::ExchangeManager * ExchangeMgr()
     {
         if (mSystemState != nullptr)

src/darwin/Framework/CHIP/MTRDeviceController_Concrete.h

@@ -178,6 +178,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)invalidateCASESessionForNode:(NSNumber *)nodeID;
 
+/**
+ * Invalidate the CASE session establishment for the specified node ID.
+ * Must not be called on the Matter event queue.
+ */
+- (void)invalidateCASESessionEstablishmentForNode:(NSNumber *)nodeID;
+
 /**
  * Download log of the desired type from the device.
  */

src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm

@@ -1619,6 +1619,17 @@ - (void)invalidateCASESessionForNode:(NSNumber *)nodeID;
     [self syncRunOnWorkQueue:block error:nil];
 }
 
+- (void)invalidateCASESessionEstablishmentForNode:(NSNumber *)nodeID;
+{
+    auto block = ^{
+        auto caseSessionMgr = self->_cppCommissioner->CASESessionMgr();
+        VerifyOrDie(caseSessionMgr != nullptr);
+        caseSessionMgr->ReleaseSession(self->_cppCommissioner->GetPeerScopedId(nodeID.unsignedLongLongValue));
+    };
+
+    [self syncRunOnWorkQueue:block error:nil];
+}
+
 - (void)operationalInstanceAdded:(NSNumber *)nodeID
 {
     // Don't use deviceForNodeID here, because we don't want to create the

src/darwin/Framework/CHIP/MTRDevice_Concrete.mm

@@ -898,6 +898,12 @@ - (void)_triggerResubscribeWithReason:(NSString *)reason nodeLikelyReachable:(BO
             subscriptionCallback->ResetResubscriptionBackoff();
         }
         readClientToResubscribe->TriggerResubscribeIfScheduled(reason.UTF8String);
+    } else if (_internalDeviceState == MTRInternalDeviceStateSubscribing && nodeLikelyReachable) {
+        // If we have reason to suspect that the node is now reachable and we haven’t established a
+        // CASE session yet, let’s consider it to be stalled and invalidate the pairing session.
+        dispatch_async(self.queue, ^{
+            [[self _concreteController] invalidateCASESessionEstablishmentForNode:self->_nodeID];
+        });
     }
 }