removed MessagePermitted bypass

project-chip · Feb 2, 2022 · 1626ecb · 1626ecb
1 parent 2a6dc3e
commit 1626ecb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp
@@ -437,12 +437,8 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
         MessageHandled();
     });
 
-    // TODO : Remove this bypass for group as to perform the MessagePermitted function Issue # 12101
-    if (!IsGroupExchangeContext())
-    {
-        ReturnErrorOnFailure(
-            mDispatch.OnMessageReceived(messageCounter, payloadHeader, peerAddress, msgFlags, GetReliableMessageContext()));
-    }
+    ReturnErrorOnFailure(mDispatch.OnMessageReceived(messageCounter, payloadHeader, peerAddress, msgFlags,
+                                                     GetReliableMessageContext(), IsGroupExchangeContext()));
 
     if (IsAckPending() && !mDelegate)
     {

diff --git a/src/messaging/ExchangeMessageDispatch.cpp b/src/messaging/ExchangeMessageDispatch.cpp
@@ -115,12 +115,12 @@ CHIP_ERROR ExchangeMessageDispatch::SendMessage(SessionManager * sessionManager,
 
 CHIP_ERROR ExchangeMessageDispatch::OnMessageReceived(uint32_t messageCounter, const PayloadHeader & payloadHeader,
                                                       const Transport::PeerAddress & peerAddress, MessageFlags msgFlags,
-                                                      ReliableMessageContext * reliableMessageContext)
+                                                      ReliableMessageContext * reliableMessageContext, bool isGroupMessage)
 {
     ReturnErrorCodeIf(!MessagePermitted(payloadHeader.GetProtocolID().GetProtocolId(), payloadHeader.GetMessageType()),
                       CHIP_ERROR_INVALID_ARGUMENT);
 
-    if (IsReliableTransmissionAllowed())
+    if (IsReliableTransmissionAllowed() && !isGroupMessage)
     {
         if (!msgFlags.Has(MessageFlagValues::kDuplicateMessage) && payloadHeader.IsAckMsg() &&
             payloadHeader.GetAckMessageCounter().HasValue())

diff --git a/src/messaging/ExchangeMessageDispatch.h b/src/messaging/ExchangeMessageDispatch.h
@@ -44,7 +44,7 @@ class ExchangeMessageDispatch
                            uint8_t type, System::PacketBufferHandle && message);
     CHIP_ERROR OnMessageReceived(uint32_t messageCounter, const PayloadHeader & payloadHeader,
                                  const Transport::PeerAddress & peerAddress, MessageFlags msgFlags,
-                                 ReliableMessageContext * reliableMessageContext);
+                                 ReliableMessageContext * reliableMessageContext, bool isGroupMessage);
 
 protected:
     virtual bool MessagePermitted(uint16_t protocol, uint8_t type) = 0;

diff --git a/src/messaging/tests/TestReliableMessageProtocol.cpp b/src/messaging/tests/TestReliableMessageProtocol.cpp
@@ -330,7 +330,6 @@ void CheckFailedMessageRetainOnSend(nlTestSuite * inSuite, void * inContext)
     });
 
     mockSender.mMessageDispatch.mRetainMessageOnSend = false;
-
     // Let's drop the initial message
     gLoopback.mSentMessageCount    = 0;
     gLoopback.mNumMessagesToDrop   = 1;

diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp
@@ -583,6 +583,8 @@ void SessionManager::SecureGroupMessageDispatch(const PacketHeader & packetHeade
     // MCSP check
     if (packetHeader.IsValidMCSPMsg())
     {
+        // TODO: When MCSP Msg, create Secure Session instead of a Group session
+
         // TODO
         // if (packetHeader.GetDestinationNodeId().Value() == ThisDeviceNodeID)
         // {
@@ -618,6 +620,7 @@ void SessionManager::SecureGroupMessageDispatch(const PacketHeader & packetHeade
     if (mCB != nullptr)
     {
         // TODO : remove hard coded fabric index once GroupDataProvider->Decrypt is implemented
+        // TODO : When MCSP is done, clean up session creation logique
         Optional<SessionHandle> session = CreateGroupSession(packetHeader.GetDestinationGroupId().Value(), 1);
 
         VerifyOrReturn(session.HasValue(), ChipLogError(Inet, "Error when creating group session handle."));