Added AsyncDtlsSessionLifecycleCallbacks

Author: szysas

kotlin-mbedtls/src/main/kotlin/org/opencoap/ssl/transport/DtlsServer.kt

@@ -202,11 +202,11 @@ class DtlsServer(
         override fun close() = ctx.close()
 
         private fun reportHandshakeStarted() {
-            executor.supply { lifecycleCallbacks.handshakeStarted(peerAddress) }
+            lifecycleCallbacks.handshakeStarted(peerAddress)
         }
 
         private fun reportHandshakeFinished(reason: DtlsSessionLifecycleCallbacks.Reason, err: Throwable? = null) {
-            executor.supply { lifecycleCallbacks.handshakeFinished(peerAddress, ctx.startTimestamp, ctx.finishTimestamp, reason, err) }
+            lifecycleCallbacks.handshakeFinished(peerAddress, ctx.startTimestamp, ctx.finishTimestamp, reason, err)
         }
     }
 
@@ -287,11 +287,11 @@ class DtlsServer(
         }
 
         private fun reportSessionStarted() {
-            executor.supply { lifecycleCallbacks.sessionStarted(peerAddress, ctx.cipherSuite, ctx.reloaded) }
+            lifecycleCallbacks.sessionStarted(peerAddress, ctx.cipherSuite, ctx.reloaded)
         }
 
         private fun reportSessionFinished(reason: DtlsSessionLifecycleCallbacks.Reason, err: Throwable? = null) {
-            executor.supply { lifecycleCallbacks.sessionFinished(peerAddress, reason, err) }
+            lifecycleCallbacks.sessionFinished(peerAddress, reason, err)
         }
     }
 }

kotlin-mbedtls/src/main/kotlin/org/opencoap/ssl/transport/DtlsSessionLifecycleCallbacks.kt

@@ -17,13 +17,37 @@
 package org.opencoap.ssl.transport
 
 import java.net.InetSocketAddress
+import java.util.concurrent.Executor
 
 interface DtlsSessionLifecycleCallbacks {
     enum class Reason {
         SUCCEEDED, FAILED, CLOSED, EXPIRED
     }
+
     fun handshakeStarted(adr: InetSocketAddress) = Unit
-    fun handshakeFinished(adr: InetSocketAddress, hanshakeStartTimestamp: Long, hanshakeFinishTimestamp: Long, reason: Reason, throwable: Throwable? = null) = Unit
+    fun handshakeFinished(adr: InetSocketAddress, hanshakeStartTimestamp: Long, hanshakeFinishTimestamp: Long, reason: Reason, throwable: Throwable? = null) =
+        Unit
+
     fun sessionStarted(adr: InetSocketAddress, cipherSuite: String, reloaded: Boolean) = Unit
     fun sessionFinished(adr: InetSocketAddress, reason: Reason, throwable: Throwable? = null) = Unit
 }
+
+class AsyncDtlsSessionLifecycleCallbacks(private val executor: Executor, private val callbacks: DtlsSessionLifecycleCallbacks) :
+    DtlsSessionLifecycleCallbacks {
+
+    override fun handshakeStarted(adr: InetSocketAddress) {
+        executor.supply { callbacks.handshakeStarted(adr) }
+    }
+
+    override fun handshakeFinished(adr: InetSocketAddress, hanshakeStartTimestamp: Long, hanshakeFinishTimestamp: Long, reason: DtlsSessionLifecycleCallbacks.Reason, throwable: Throwable?) {
+        executor.supply { callbacks.handshakeFinished(adr, hanshakeStartTimestamp, hanshakeFinishTimestamp, reason, throwable) }
+    }
+
+    override fun sessionStarted(adr: InetSocketAddress, cipherSuite: String, reloaded: Boolean) {
+        executor.supply { callbacks.sessionStarted(adr, cipherSuite, reloaded) }
+    }
+
+    override fun sessionFinished(adr: InetSocketAddress, reason: DtlsSessionLifecycleCallbacks.Reason, throwable: Throwable?) {
+        executor.supply { callbacks.sessionFinished(adr, reason, throwable) }
+    }
+}

kotlin-mbedtls/src/test/kotlin/org/opencoap/ssl/transport/AsyncDtlsSessionLifecycleCallbacksTest.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2022-2023 kotlin-mbedtls contributors (https://github.com/open-coap/kotlin-mbedtls)
+ * SPDX-License-Identifier: Apache-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.opencoap.ssl.transport
+
+import io.mockk.Called
+import io.mockk.confirmVerified
+import io.mockk.mockk
+import io.mockk.verify
+import org.junit.jupiter.api.Test
+import org.opencoap.ssl.transport.DtlsSessionLifecycleCallbacks.Reason
+import org.opencoap.ssl.util.localAddress
+import java.util.concurrent.Executors
+
+class AsyncDtlsSessionLifecycleCallbacksTest {
+
+    @Test
+    fun `should invoke callbacks`() {
+        val callbackMock = mockk<DtlsSessionLifecycleCallbacks>()
+        val asyncCallbacks = AsyncDtlsSessionLifecycleCallbacks(Executors.newSingleThreadExecutor(), callbackMock)
+
+        // when
+        asyncCallbacks.handshakeStarted(localAddress(5683))
+        asyncCallbacks.handshakeFinished(localAddress(5683), 0, 1, Reason.SUCCEEDED)
+        asyncCallbacks.sessionStarted(localAddress(5683), "A", false)
+        asyncCallbacks.sessionFinished(localAddress(5683), Reason.CLOSED)
+
+        // then
+        verify {
+            callbackMock.handshakeStarted(any())
+            callbackMock.handshakeFinished(any(), 0, 1, Reason.SUCCEEDED)
+            callbackMock.sessionStarted(any(), "A", false)
+            callbackMock.sessionFinished(any(), Reason.CLOSED)
+        }
+        confirmVerified(callbackMock)
+    }
+
+    @Test
+    fun `should not invoke callbacks with non operational executor`() {
+        val callbackMock = mockk<DtlsSessionLifecycleCallbacks>()
+        val asyncCallbacks = AsyncDtlsSessionLifecycleCallbacks({}, callbackMock)
+
+        // when
+        asyncCallbacks.handshakeStarted(localAddress(5683))
+        asyncCallbacks.handshakeFinished(localAddress(5683), 0, 1, Reason.SUCCEEDED)
+        asyncCallbacks.sessionStarted(localAddress(5683), "A", false)
+        asyncCallbacks.sessionFinished(localAddress(5683), Reason.CLOSED)
+
+        // then
+        verify {
+            callbackMock wasNot Called
+        }
+    }
+}