Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate DTLS message before decryption #59

Merged
merged 14 commits into from
Nov 6, 2024
Merged

Validate DTLS message before decryption #59

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6dc5519
Validate DTLS message before decryption
JuhaPekkaa May 15, 2024
b49927d
change buf to memory
JuhaPekkaa May 29, 2024
0170508
change buf to memory
JuhaPekkaa May 29, 2024
eee7d27
check record
JuhaPekkaa May 29, 2024
973a493
fix build
JuhaPekkaa May 29, 2024
100a112
Merge branch 'master' into validate-dtls
JuhaPekkaa Sep 4, 2024
9349c4b
format merge
JuhaPekkaa Sep 4, 2024
7816ad9
format
JuhaPekkaa Sep 4, 2024
9aa9675
attempt magic
JuhaPekkaa Sep 4, 2024
c09d46c
add error
JuhaPekkaa Sep 4, 2024
65adba3
angry ktlint
JuhaPekkaa Sep 4, 2024
f1e015b
changes
JuhaPekkaa Oct 15, 2024
0768bf3
require buffer
JuhaPekkaa Oct 23, 2024
8a56707
remove null safety
JuhaPekkaa Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kotlin-mbedtls-netty/src/main/kotlin/org/opencoap/ssl/netty/DtlsChannelHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class DtlsChannelHandler @JvmOverloads constructor(

private fun loadSession(result: DtlsServer.ReceiveResult.CidSessionMissing, msg: DatagramPacket, ctx: ChannelHandlerContext) {
sessionStore.read(result.cid)
.thenApplyAsync({ sessBuf -> dtlsServer.loadSession(sessBuf, msg.sender(), result.cid) }, ctx.executor())
.thenApplyAsync({ sessBuf -> dtlsServer.loadSession(sessBuf, msg.sender(), result.cid, msg.content().nioBuffer()) }, ctx.executor())
.whenComplete { isLoaded: Boolean?, _ ->
if (isLoaded == true) {
channelRead(ctx, msg)
Expand Down
4 changes: 2 additions & 2 deletions kotlin-mbedtls/src/main/kotlin/org/opencoap/ssl/transport/DtlsServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class DtlsServer(
updateSessionAuthenticationContext(adr, ctx.authenticationContext)
}

fun loadSession(sessBuf: SessionWithContext?, adr: InetSocketAddress, cid: ByteArray, dtlsPacket: ByteBuffer? = null): Boolean {
fun loadSession(sessBuf: SessionWithContext?, adr: InetSocketAddress, cid: ByteArray, dtlsPacket: ByteBuffer): Boolean {
return try {
if (sessBuf == null) {
logger.warn("[{}] [CID:{}] DTLS session not found", adr, cid.toHex())
Expand All @@ -152,7 +152,7 @@ class DtlsServer(
}

val sslSession = sslConfig.loadSession(cid, sessBuf.sessionBlob, adr)
dtlsPacket?.let {
dtlsPacket.let {
JuhaPekkaa marked this conversation as resolved.
Show resolved Hide resolved
val verificationResult = sslSession.checkRecord(it)
if (verificationResult is SslSession.VerificationResult.Invalid) {
logger.warn("[{}] [CID:{}] Record verification failed: {}", adr, cid.toHex(), verificationResult.message)
Expand Down
Loading