impr

open-coap · Aug 22, 2023 · 5be6184 · 5be6184
1 parent 9ee12f3
commit 5be6184
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/kotlin-mbedtls-netty/src/main/kotlin/org/opencoap/ssl/netty/DtlsChannelHandler.kt b/kotlin-mbedtls-netty/src/main/kotlin/org/opencoap/ssl/netty/DtlsChannelHandler.kt
@@ -91,10 +91,13 @@ class DtlsChannelHandler @JvmOverloads constructor(
         when (msg) {
             is DatagramPacket -> write(msg, promise, ctx)
             is SessionAuthenticationContext -> {
-                if (dtlsServer.putSessionAuthenticationContext(msg.adr, msg.key, msg.value)) {
+                msg.map.forEach { (key, value) ->
+                    if (!dtlsServer.putSessionAuthenticationContext(msg.adr, key, value)) {
+                        promise.setFailure(SslException("Session does not exists"))
+                    }
+                }
+                if (!promise.isDone) {
                     promise.setSuccess()
-                } else {
-                    promise.setFailure(SslException("Session does not exists"))
                 }
             }
 

diff --git a/kotlin-mbedtls-netty/src/main/kotlin/org/opencoap/ssl/netty/SessionAuthenticationContext.kt b/kotlin-mbedtls-netty/src/main/kotlin/org/opencoap/ssl/netty/SessionAuthenticationContext.kt
@@ -18,4 +18,4 @@ package org.opencoap.ssl.netty
 
 import java.net.InetSocketAddress
 
-data class SessionAuthenticationContext(val adr: InetSocketAddress, val key: String, val value: String?)
+data class SessionAuthenticationContext(val adr: InetSocketAddress, val map: Map<String, String?>)
diff --git a/kotlin-mbedtls-netty/src/test/kotlin/org/opencoap/ssl/netty/NettyTest.kt b/kotlin-mbedtls-netty/src/test/kotlin/org/opencoap/ssl/netty/NettyTest.kt
@@ -180,7 +180,7 @@ class NettyTest {
         assertEquals("ECHO:hi", client.receive(5.seconds).await())
 
         // when
-        srvChannel.writeAndFlush(SessionAuthenticationContext(client.localAddress(), "AUTH", "007:")).get()
+        srvChannel.writeAndFlush(SessionAuthenticationContext(client.localAddress(), mapOf("AUTH" to "007:"))).get()
 
         // then
         assertTrue(client.send("hi").await())
@@ -192,7 +192,7 @@ class NettyTest {
     @Test
     fun `should fail to forward authentication context for non existing client`() {
         assertThatThrownBy {
-            srvChannel.writeAndFlush(SessionAuthenticationContext(localAddress(1), "AUTH", "007:")).get()
+            srvChannel.writeAndFlush(SessionAuthenticationContext(localAddress(1), mapOf("AUTH" to "007:"))).get()
         }.hasRootCause(SslException("Session does not exists"))
     }