Native Sockets TLS Client/Server support for linux #2939
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,23 @@ | ||
| kotlin { | ||
| linuxX64 { | ||
| val main by compilations.getting { | ||
| val openssl by cinterops.creating { | ||
| defFile(project.file("linuxX64/interop/openssl.def")) | ||
| } | ||
| } | ||
| } | ||
| sourceSets { | ||
| jvmAndNixMain { | ||
| dependencies { | ||
| api(project(":ktor-network")) | ||
| api(project(":ktor-utils")) | ||
| } | ||
| } | ||
| jvmTest { | ||
| dependencies { | ||
| api(project(":ktor-network:ktor-network-tls:ktor-network-tls-certificates")) | ||
| api(libs.netty.handler) | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| /* | ||
| * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package io.ktor.network.tls | ||
|
|
||
| public class PKCS12Certificate( | ||
|
|
||
| public val path: String, | ||
| public val password: (() -> CharArray)? | ||
|
There was a problem hiding this comment. consider adding default if password really can be null |
||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Copyright 2014-2019 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package io.ktor.network.tls | ||
|
|
||
| /** | ||
| * [TLSConfig] builder. | ||
| */ | ||
| public actual class TLSConfigBuilder actual constructor(private val isClient: Boolean) { | ||
| private var authenticationBuilder: TLSAuthenticationConfigBuilder? = null | ||
| private var verificationBuilder: TLSVerificationConfigBuilder? = null | ||
|
|
||
| /** | ||
| * Custom server name for TLS server name extension. | ||
| * See also: https://en.wikipedia.org/wiki/Server_Name_Indication | ||
| */ | ||
| public actual var serverName: String? = null | ||
|
|
||
| public actual fun authentication( | ||
| privateKeyPassword: () -> CharArray, | ||
| block: TLSAuthenticationConfigBuilder.() -> Unit | ||
| ) { | ||
| authenticationBuilder = TLSAuthenticationConfigBuilder(privateKeyPassword).apply(block) | ||
| } | ||
|
|
||
| public actual fun verification( | ||
| block: TLSVerificationConfigBuilder.() -> Unit | ||
| ) { | ||
| verificationBuilder = TLSVerificationConfigBuilder().apply(block) | ||
| } | ||
|
|
||
| public actual fun takeFrom(other: TLSConfigBuilder) { | ||
| serverName = other.serverName | ||
| authenticationBuilder = other.authenticationBuilder | ||
| } | ||
|
|
||
| /** | ||
| * Create [TLSConfig]. | ||
| */ | ||
| public actual fun build(): TLSConfig = TLSConfig( | ||
| isClient = isClient, | ||
| serverName = serverName, | ||
| authentication = authenticationBuilder?.build(), | ||
| verification = verificationBuilder?.build() | ||
| ) | ||
| } | ||
|
|
||
| public actual class TLSAuthenticationConfigBuilder actual constructor( | ||
| private val privateKeyPassword: () -> CharArray | ||
| ) { | ||
| private var certificate: PKCS12Certificate? = null | ||
|
|
||
| public actual fun pkcs12Certificate(certificatePath: String, certificatePassword: (() -> CharArray)?) { | ||
| certificate = PKCS12Certificate(certificatePath, certificatePassword) | ||
| } | ||
|
|
||
| public actual fun build(): TLSAuthenticationConfig = TLSAuthenticationConfig( | ||
| certificate, | ||
| privateKeyPassword | ||
| ) | ||
| } | ||
|
|
||
| public actual class TLSVerificationConfigBuilder { | ||
| private var certificate: PKCS12Certificate? = null | ||
|
|
||
| public actual fun pkcs12Certificate(certificatePath: String, certificatePassword: (() -> CharArray)?) { | ||
| certificate = PKCS12Certificate(certificatePath, certificatePassword) | ||
| } | ||
|
|
||
| public actual fun build(): TLSVerificationConfig = TLSVerificationConfig( | ||
| certificate | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // ktlint-disable filename | ||
| /* | ||
| * Copyright 2014-2019 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package io.ktor.network.tls | ||
|
|
||
| import io.ktor.utils.io.core.* | ||
|
|
||
| public actual class TLSConfig( | ||
| public actual val isClient: Boolean, | ||
| public actual val serverName: String?, | ||
| public actual val authentication: TLSAuthenticationConfig?, | ||
| public actual val verification: TLSVerificationConfig?, | ||
| ) : Closeable { | ||
| override fun close() { | ||
| //NOOP | ||
|
|
||
| } | ||
| } | ||
|
|
||
| public actual class TLSAuthenticationConfig( | ||
| public val certificate: PKCS12Certificate?, | ||
| public val privateKeyPassword: () -> CharArray | ||
| ) | ||
|
|
||
| public actual class TLSVerificationConfig( | ||
| public val certificate: PKCS12Certificate?, | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| /* | ||
| * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package io.ktor.network.tls | ||
|
|
||
| import io.ktor.network.sockets.* | ||
| import kotlin.coroutines.* | ||
|
|
||
| public actual suspend fun Connection.tls( | ||
| coroutineContext: CoroutineContext, | ||
| config: TLSConfig | ||
| ): Socket { | ||
| error("TLS is not supported on Darwin platform.") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could we try adding other platofrms?