StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
perf: cache credential keystore key handle
David Nashash2ebc859240a7
diff --git a/data/src/main/java/com/streamvault/data/security/CachingSecretKeyProvider.kt b/data/src/main/java/com/streamvault/data/security/CachingSecretKeyProvider.ktnew file mode 100644index 00000000..3b976b9c--- /dev/null+++ b/data/src/main/java/com/streamvault/data/security/CachingSecretKeyProvider.kt@@ -0,0 +1,17 @@+package com.streamvault.data.security++import javax.crypto.SecretKey++internal class CachingSecretKeyProvider(+ private val loadOrCreate: () -> SecretKey+) {+ @Volatile+ private var cached: SecretKey? = null++ fun get(): SecretKey {+ cached?.let { return it }+ return synchronized(this) {+ cached ?: loadOrCreate().also { cached = it }+ }+ }+}diff --git a/data/src/main/java/com/streamvault/data/security/CredentialCrypto.kt b/data/src/main/java/com/streamvault/data/security/CredentialCrypto.ktindex 5e885077..29c8b638 100644--- a/data/src/main/java/com/streamvault/data/security/CredentialCrypto.kt+++ b/data/src/main/java/com/streamvault/data/security/CredentialCrypto.kt@@ -34,13 +34,14 @@ class AndroidKeystoreCredentialCrypto @Inject constructor() : CredentialCrypto {private val IV_SIZE_BYTES = 12private val AUTH_TAG_BITS = 128private val PREFIX = "enc:v1:"+ private val secretKeyProvider = CachingSecretKeyProvider(::loadOrCreateSecretKey)override fun encryptIfNeeded(value: String): String {if (value.isBlank() || value.startsWith(PREFIX)) return valuereturn try {val cipher = Cipher.getInstance(TRANSFORMATION)- cipher.init(Cipher.ENCRYPT_MODE, getOrCreateSecretKey())+ cipher.init(Cipher.ENCRYPT_MODE, secretKeyProvider.get())val iv = cipher.ivval encrypted = cipher.doFinal(value.toByteArray(Charsets.UTF_8))val packed = iv + encrypted@@ -68,7 +69,7 @@ class AndroidKeystoreCredentialCrypto @Inject constructor() : CredentialCrypto {val cipher = Cipher.getInstance(TRANSFORMATION)cipher.init(Cipher.DECRYPT_MODE,- getOrCreateSecretKey(),+ secretKeyProvider.get(),GCMParameterSpec(AUTH_TAG_BITS, iv))String(cipher.doFinal(ciphertext), Charsets.UTF_8)@@ -78,7 +79,7 @@ class AndroidKeystoreCredentialCrypto @Inject constructor() : CredentialCrypto {}}- private fun getOrCreateSecretKey(): SecretKey {+ private fun loadOrCreateSecretKey(): SecretKey {val keyStore = KeyStore.getInstance(KEYSTORE_TYPE).apply { load(null) }val existing = keyStore.getKey(KEY_ALIAS, null) as? SecretKeyif (existing != null) return existingdiff --git a/data/src/test/java/com/streamvault/data/security/CachingSecretKeyProviderTest.kt b/data/src/test/java/com/streamvault/data/security/CachingSecretKeyProviderTest.ktnew file mode 100644index 00000000..7ba5c1bc--- /dev/null+++ b/data/src/test/java/com/streamvault/data/security/CachingSecretKeyProviderTest.kt@@ -0,0 +1,64 @@+package com.streamvault.data.security++import com.google.common.truth.Truth.assertThat+import org.junit.Assert.assertThrows+import org.junit.Test+import java.util.concurrent.Executors+import java.util.concurrent.atomic.AtomicInteger+import javax.crypto.SecretKey+import javax.crypto.spec.SecretKeySpec++class CachingSecretKeyProviderTest {++ @Test+ fun `sequential gets load the key once`() {+ val loads = AtomicInteger()+ val key = SecretKeySpec(byteArrayOf(1, 2, 3, 4), "AES")+ val provider = CachingSecretKeyProvider {+ loads.incrementAndGet()+ key+ }++ assertThat(provider.get()).isSameInstanceAs(key)+ assertThat(provider.get()).isSameInstanceAs(key)+ assertThat(loads.get()).isEqualTo(1)+ }++ @Test+ fun `concurrent gets load the key once`() {+ val loads = AtomicInteger()+ val key = SecretKeySpec(byteArrayOf(1, 2, 3, 4), "AES")+ val provider = CachingSecretKeyProvider {+ loads.incrementAndGet()+ Thread.sleep(10)+ key+ }++ val executor = Executors.newFixedThreadPool(8)+ try {+ val results = (1..16).map {+ executor.submit<SecretKey> { provider.get() }+ }.map { it.get() }+ assertThat(results).containsExactlyElementsIn(List(16) { key })+ assertThat(loads.get()).isEqualTo(1)+ } finally {+ executor.shutdownNow()+ }+ }++ @Test+ fun `loader failure is not cached`() {+ val loads = AtomicInteger()+ val key = SecretKeySpec(byteArrayOf(1, 2, 3, 4), "AES")+ val provider = CachingSecretKeyProvider {+ if (loads.incrementAndGet() == 1) {+ throw IllegalStateException("keystore unavailable")+ }+ key+ }++ assertThrows(IllegalStateException::class.java) { provider.get() }+ assertThat(provider.get()).isSameInstanceAs(key)+ assertThat(loads.get()).isEqualTo(2)+ }+}