kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix client certificate-only usage

Browse Source
This commit is contained in:
Niko Diamadis
2024-04-22 00:59:19 +02:00
parent 79584c85c1
commit 60946e4e1e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/github/gotify/api/CertUtils.kt
View File

@@ -66,6 +66,7 @@ internal object CertUtils {
) )
if (tempKeyManagers.isNotEmpty()) { if (tempKeyManagers.isNotEmpty()) {
keyManagers = tempKeyManagers keyManagers = tempKeyManagers
customManagers = true
} }
} }
if (!settings.validateSSL) { if (!settings.validateSSL) {
@@ -75,10 +76,17 @@ internal object CertUtils {
if (customManagers || !settings.validateSSL) { if (customManagers || !settings.validateSSL) {
val context = SSLContext.getInstance("TLS") val context = SSLContext.getInstance("TLS")
context.init(keyManagers, trustManagers, SecureRandom()) context.init(keyManagers, trustManagers, SecureRandom())
if (trustManagers != null) {
// Use custom trust manager
builder.sslSocketFactory( builder.sslSocketFactory(
context.socketFactory, context.socketFactory,
trustManagers!![0] as X509TrustManager trustManagers[0] as X509TrustManager
) )
} else {
// Fall back to system trust managers
@Suppress("DEPRECATION")
builder.sslSocketFactory(context.socketFactory)
}
} }
} catch (e: Exception) { } catch (e: Exception) {
// We shouldn't have issues since the cert is verified on login. // We shouldn't have issues since the cert is verified on login.