Reject Confirmable Empty messages

NZSmartie · Dec 4, 2017 · 47d3115 · 47d3115
1 parent c5da5f2
commit 47d3115
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 3 deletions.
diff --git a/src/CoAPNet/CoapClient.cs b/src/CoAPNet/CoapClient.cs
@@ -182,6 +182,14 @@ private async Task ReceiveAsyncInternal()
                         if (message.Type == CoapMessageType.Reset && message.Code != CoapMessageCode.None)
                             continue;
 
+                        // Reject confirmable empty messages
+                        if (message.Type == CoapMessageType.Confirmable && message.Code == CoapMessageCode.None)
+                        {
+                            await SendAsync(new CoapMessage { Id = message.Id, Type = CoapMessageType.Reset }, payload.Endpoint);
+                            continue;
+                        }
+
+                        // Ignore repeated messages
                         if (IsRepeated(payload.Endpoint, message.Id))
                             continue;
 

diff --git a/tests/CoAPNet.Tests/CoapClientTests.cs b/tests/CoAPNet.Tests/CoapClientTests.cs
@@ -499,12 +499,52 @@ public void TestCancelRequestRetransmitAttempts()
             Assert.Inconclusive("Not Implemented");
         }
 
-        // TODO: Test Reject Empty Non-Confirmable Message
+        // TODO: Test Reject Empty Confirmable Message
         [Test]
         [Category("[RFC7252] Section 4.3")]
-        public void TestRejectEmptyNonConfirmableMessage()
+        public async Task TestRejectEmptyConfirmableMessage()
         {
-            Assert.Inconclusive("Not Implemented");
+            // Arrange
+            var mockClientEndpoint = new Mock<MockEndpoint> { CallBase = true };
+
+            var ping = new CoapMessage
+            {
+                Id = 0x1234,
+                Type = CoapMessageType.Confirmable,
+            };
+
+            var expected = new CoapMessage
+            {
+                Id = 0x1234,
+                Type = CoapMessageType.Reset,
+            };
+
+            mockClientEndpoint
+                .SetupSequence(c => c.MockReceiveAsync())
+                .Returns(Task.FromResult(new CoapPacket { Payload = ping.ToBytes() }))
+                .Throws(new CoapEndpointException("disposed"));
+
+            // Ack
+            using (var client = new CoapClient(mockClientEndpoint.Object))
+            {
+                var ct = new CancellationTokenSource(MaxTaskTimeout);
+
+                try
+                {
+                    while (true)
+                    {
+                        await client.ReceiveAsync(ct.Token);
+                    }
+                }
+                catch (CoapEndpointException)
+                {
+                    Debug.WriteLine($"Caught CoapEndpointException", nameof(TestReceiveMulticastMessagFromMulticastEndpoint));
+                }
+            }
+
+            // Assert
+            mockClientEndpoint.Verify(x => x.ReceiveAsync(), Times.AtLeastOnce);
+            mockClientEndpoint.Verify(x => x.SendAsync(It.Is<CoapPacket>(p => p.Payload.SequenceEqual(expected.ToBytes()))), Times.AtLeastOnce);
         }
 
         // TODO: Test Multicast Message Is Marked Multicast