chore: optimise code

Signed-off-by: qwq233 <[email protected]>

Author: qwq233

service/src/main/java/io/github/a13e300/tricky_store/Config.kt

@@ -155,7 +155,7 @@ object Config {
         val generalSettings: General = General(),
         @TomlComments("Remember to override the corresponding system properties when modifying the following values") val deviceProps: DeviceProps = DeviceProps(),
         val globalConfig: AppConfig = AppConfig(),
-        @TomlComments("Disable specific module function.", "Do not modify if you know nothing about it.") val additionalAppConfig: Map<String, AppConfig> = mapOf(
+        @TomlComments("Disable specific module function for specific app.", "Do not modify if you know nothing about it.") val additionalAppConfig: Map<String, AppConfig> = mapOf(
             "com.example.app" to AppConfig(generateKey = true, createOperation = true, importKey = true)
         )
     ) {
@@ -165,6 +165,7 @@ object Config {
             @TomlComments("SDK Version (i.e.: 35 for Android 15)") val osVersion: Int = Build.VERSION.SDK_INT,
             @TomlComments("Auto reset the security patch props on startup") val autoResetProps: Boolean = true,
         )
+
         @Serializable
         data class DeviceProps(
             val brand: String = Build.BRAND,
@@ -187,6 +188,16 @@ object Config {
         )
     }
 
+    fun isGenerateKeyEnabled(callingUid: Int) = devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.generateKey == true && devConfig.globalConfig.generateKey
+
+    fun isCreateOperationEnabled(callingUid: Int) = devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.createOperation == true && devConfig.globalConfig.createOperation
+
+    fun isImportKeyEnabled(callingUid: Int) = devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.importKey == true && devConfig.globalConfig.importKey
+
+    private fun Int.getPackageNameByUid() = runCatching {
+        getPm()?.getPackagesForUid(this)?.first()
+    }.getOrNull()
+
     fun parseDevConfig(f: File?) = runCatching {
         f ?: return@runCatching
         // stop watching writing to prevent recursive calls

service/src/main/java/io/github/a13e300/tricky_store/KeystoreInterceptor.kt

@@ -9,7 +9,6 @@ import android.system.keystore2.IKeystoreService
 import android.system.keystore2.KeyDescriptor
 import android.system.keystore2.KeyEntryResponse
 import io.github.a13e300.tricky_store.Cache.Key
-import io.github.a13e300.tricky_store.Config.devConfig
 import io.github.a13e300.tricky_store.binder.BinderInterceptor
 import io.github.a13e300.tricky_store.keystore.CertHack
 import io.github.a13e300.tricky_store.keystore.Utils
@@ -49,9 +48,7 @@ object KeystoreInterceptor : BinderInterceptor() {
                     if (Config.needGenerate(callingUid))
                         runCatching {
                             data.enforceInterface(IKeystoreService.DESCRIPTOR)
-                            if (!devConfig.globalConfig.generateKey
-                                || devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.generateKey == false
-                            ) {
+                            if (!Config.isGenerateKeyEnabled(callingUid)) {
                                 Logger.d("generateKey feature disabled for $callingUid")
                                 return Skip
                             }
@@ -62,6 +59,7 @@ object KeystoreInterceptor : BinderInterceptor() {
                                 Cache.getKeyResponse(callingUid, descriptor.alias)
                             val p = Parcel.obtain()
                             if (response == null) {
+                                Logger.i("pass null key for uid=$callingUid alias=${descriptor.alias}")
                                 p.writeTypedObject(null, 0)
                             } else {
                                 Logger.i("generate key for uid=$callingUid alias=${descriptor.alias}")
@@ -79,9 +77,7 @@ object KeystoreInterceptor : BinderInterceptor() {
                 Logger.d("KeystoreInceptor onPreTransact updateSubcomponent uid=$callingUid pid=$callingPid")
                 runCatching {
                     data.enforceInterface(IKeystoreService.DESCRIPTOR)
-                    if (!devConfig.globalConfig.importKey
-                        || devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.importKey == false
-                    ) {
+                    if (!Config.isImportKeyEnabled(callingUid)) {
                         Logger.d("importKey feature disabled for $callingUid")
                         return Skip
                     }
@@ -155,9 +151,7 @@ object KeystoreInterceptor : BinderInterceptor() {
             Logger.d("KeystoreInterceptor intercept getKeyEntry uid=$callingUid pid=$callingPid")
             try {
                 data.enforceInterface("android.system.keystore2.IKeystoreService")
-                if (!devConfig.globalConfig.generateKey
-                    || devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.generateKey == false
-                ) {
+                if (!Config.isGenerateKeyEnabled(callingUid)) {
                     Logger.d("getKeyEntry feature disabled for $callingUid")
                     return Skip
                 }

service/src/main/java/io/github/a13e300/tricky_store/SecurityLevelInterceptor.kt

@@ -13,7 +13,6 @@ import android.system.keystore2.IKeystoreSecurityLevel
 import android.system.keystore2.KeyDescriptor
 import android.system.keystore2.KeyEntryResponse
 import android.system.keystore2.KeyMetadata
-import io.github.a13e300.tricky_store.Config.devConfig
 import io.github.a13e300.tricky_store.binder.BinderInterceptor
 import io.github.a13e300.tricky_store.keystore.CertHack
 import io.github.a13e300.tricky_store.keystore.Utils
@@ -48,9 +47,7 @@ class SecurityLevelInterceptor(
             generateKeyTransaction -> runCatching {
                 data.enforceInterface(IKeystoreSecurityLevel.DESCRIPTOR)
                 Logger.i("intercept key gen uid=$callingUid pid=$callingPid")
-                if (!devConfig.globalConfig.generateKey
-                    || devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.generateKey == false
-                ) {
+                if (!Config.isGenerateKeyEnabled(callingUid)) {
                     Logger.d("generateKey feature disabled for $callingUid")
                     return Skip
                 }
@@ -77,9 +74,7 @@ class SecurityLevelInterceptor(
 
             importKeyTransaction -> runCatching {
                 data.enforceInterface(IKeystoreSecurityLevel.DESCRIPTOR)
-                if (!devConfig.globalConfig.importKey
-                    || devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.importKey == false
-                ) {
+                if (!Config.isImportKeyEnabled(callingUid)) {
                     Logger.d("importKey feature disabled for $callingUid")
                     return Skip
                 }
@@ -130,9 +125,7 @@ class SecurityLevelInterceptor(
             createOperationTransaction -> runCatching {
                 data.enforceInterface(IKeystoreSecurityLevel.DESCRIPTOR)
                 Logger.d("createOperationTransaction uid=$callingUid pid=$callingPid")
-                if (!devConfig.globalConfig.createOperation
-                    || devConfig.additionalAppConfig[callingUid.getPackageNameByUid()]?.createOperation == false
-                ) {
+                if (!Config.isCreateOperationEnabled(callingUid)) {
                     Logger.d("createOperation feature disabled for $callingUid")
                     return Skip
                 }

service/src/main/java/io/github/a13e300/tricky_store/util.kt

@@ -121,9 +121,5 @@ val telephonyInfos by lazy {
 
 fun String.toDER() = DEROctetString(this.toByteArray())
 
-fun Int.getPackageNameByUid() = runCatching {
-    getPm()?.getPackagesForUid(this)?.first()
-}.getOrNull()
-
 fun DEROctetString.toTaggedObj(tag: Int, explicit: Boolean = true) = DERTaggedObject(explicit, tag, this)
 fun String.trimLine() = trim().split("\n").joinToString("\n") { it.trim() }