cleaning. Added get cid to DtslServerTransport as well

open-coap · Jul 17, 2023 · 2a8bd16 · 2a8bd16
1 parent 57364cc
commit 2a8bd16
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/kotlin-mbedtls/src/main/kotlin/org/opencoap/ssl/transport/DtlsServer.kt b/kotlin-mbedtls/src/main/kotlin/org/opencoap/ssl/transport/DtlsServer.kt
@@ -50,7 +50,7 @@ class DtlsServer(
     private val sessions = mutableMapOf<InetSocketAddress, DtlsState>()
     private val cidSize = sslConfig.cidSupplier.next().size
     val numberOfSessions get() = sessions.size
-    fun getCidStateFromAddress(inet: InetSocketAddress): ByteArray? {
+    fun getSessionCid(inet: InetSocketAddress): ByteArray? {
         val dtlsState = sessions[inet] as? DtlsSession
         return dtlsState?.sessionContext?.cid
     }
@@ -220,7 +220,7 @@ class DtlsServer(
             get() = DtlsSessionContext(
                 peerCertificateSubject = ctx.peerCertificateSubject,
                 authenticationContext = authenticationContext,
-                cid = ctx.ownCid ?: ctx.peerCid
+                cid = if (ctx.ownCid?.isEmpty() != true) ctx.ownCid else ctx.peerCid
             )
 
         init {

diff --git a/kotlin-mbedtls/src/main/kotlin/org/opencoap/ssl/transport/DtlsServerTransport.kt b/kotlin-mbedtls/src/main/kotlin/org/opencoap/ssl/transport/DtlsServerTransport.kt
@@ -114,4 +114,6 @@ class DtlsServerTransport private constructor(
         executor.supply {
             dtlsServer.putSessionAuthenticationContext(adr, key, value)
         }
+
+    fun getSessionCid(adr: InetSocketAddress) = dtlsServer.getSessionCid(adr)
 }
diff --git a/kotlin-mbedtls/src/test/kotlin/org/opencoap/ssl/transport/DtlsServerTest.kt b/kotlin-mbedtls/src/test/kotlin/org/opencoap/ssl/transport/DtlsServerTest.kt
@@ -230,17 +230,17 @@ class DtlsServerTest {
     fun `should find session cid`() {
         // given
         val clientSession = clientHandshake()
-        val cid2 = dtlsServer.getCidStateFromAddress(localAddress(2_5684))
-        assert(cid2!!.isNotEmpty())
+        val cid = dtlsServer.getSessionCid(localAddress(2_5684))
+        assert(cid!!.isNotEmpty())
         clientSession.close()
     }
 
     @Test
     fun `shouldn't find session cid`() {
         // given
         val clientSession = clientHandshake()
-        val cid2 = dtlsServer.getCidStateFromAddress(localAddress(1234))
-        assertEquals(null, cid2)
+        val cid = dtlsServer.getSessionCid(localAddress(1234))
+        assertEquals(null, cid)
         clientSession.close()
     }
 

diff --git a/kotlin-mbedtls/src/test/kotlin/org/opencoap/ssl/transport/DtlsServerTransportTest.kt b/kotlin-mbedtls/src/test/kotlin/org/opencoap/ssl/transport/DtlsServerTransportTest.kt
@@ -438,6 +438,18 @@ class DtlsServerTransportTest {
         assertTrue(server.executor() is ScheduledThreadPoolExecutor)
     }
 
+    @Test
+    fun `should return cid`() {
+        server = DtlsServerTransport.create(conf, sessionStore = sessionStore)
+        val client = DtlsTransmitter.connect(server, clientConfig).await()
+
+        // when
+        client.send("hello")
+
+        val cid = server.getSessionCid(server.localAddress())
+        assert(cid != null)
+    }
+
     @Test
     fun `should set and use session context`() {
         // given