jzy/TEESimulator-RS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interceptors: keystore2: Handle missing keys error properly

Browse Source 
Signed-off-by: Dakkshesh <beakthoven@gmail.com>
This commit is contained in:
Dakkshesh
2025-09-04 12:35:17 +05:30
parent 7d371dd766
commit ff980f59fc
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/github/beakthoven/TrickyStoreOSS/interceptors/Keystore2Interceptor.kt
+16 -5
View File
@@ -77,14 +77,20 @@ object Keystore2Interceptor : BaseKeystoreInterceptor() {
if (code == getKeyEntryTransaction) { if (code == getKeyEntryTransaction) {
if (KeyBoxUtils.hasKeyboxes()) { if (KeyBoxUtils.hasKeyboxes()) {
Logger.d("intercept pre $target uid=$callingUid pid=$callingPid dataSz=${data.dataSize()}") Logger.d("intercept pre $target uid=$callingUid pid=$callingPid dataSz=${data.dataSize()}")
kotlin.runCatching { try {
data.enforceInterface(IKeystoreService.DESCRIPTOR) data.enforceInterface(IKeystoreService.DESCRIPTOR)
val descriptor = data.readTypedObject(KeyDescriptor.CREATOR) ?: return@runCatching val descriptor = data.readTypedObject(KeyDescriptor.CREATOR) ?: return Skip
if (PkgConfig.needGenerate(callingUid)) { if (PkgConfig.needGenerate(callingUid)) {
val response = SecurityLevelInterceptor.getKeyResponse(callingUid, descriptor.alias) val response = SecurityLevelInterceptor.getKeyResponse(callingUid, descriptor.alias)
?: return@runCatching if (response != null) {
Logger.i("Generate key for uid=$callingUid alias=${descriptor.alias}") Logger.i("Found generated response for uid=$callingUid alias=${descriptor.alias}")
return createTypedObjectReply(response) return createTypedObjectReply(response)
} else {
Logger.e("No generated response found for uid=$callingUid alias=${descriptor.alias}")
val nullParcel = Parcel.obtain()
nullParcel.writeTypedObject(null as KeyEntryResponse?, 0)
return OverrideReply(0, nullParcel)
}
} else if (PkgConfig.needHack(callingUid)) { } else if (PkgConfig.needHack(callingUid)) {
if (SecurityLevelInterceptor.shouldSkipLeafHack(callingUid, descriptor.alias)) { if (SecurityLevelInterceptor.shouldSkipLeafHack(callingUid, descriptor.alias)) {
Logger.i("skip leaf hack for uid=$callingUid alias=${descriptor.alias}") Logger.i("skip leaf hack for uid=$callingUid alias=${descriptor.alias}")
@@ -94,7 +100,9 @@ object Keystore2Interceptor : BaseKeystoreInterceptor() {
return createTypedObjectReply(response) return createTypedObjectReply(response)
} else { } else {
Logger.e("No generated response found for uid=$callingUid alias=${descriptor.alias}") Logger.e("No generated response found for uid=$callingUid alias=${descriptor.alias}")
return@runCatching val nullParcel = Parcel.obtain()
nullParcel.writeTypedObject(null as KeyEntryResponse?, 0)
return OverrideReply(0, nullParcel)
} }
} else { } else {
Logger.i("proceeding with leaf hack for uid=$callingUid alias=${descriptor.alias}") Logger.i("proceeding with leaf hack for uid=$callingUid alias=${descriptor.alias}")
@@ -102,6 +110,9 @@ object Keystore2Interceptor : BaseKeystoreInterceptor() {
} }
} }
return Skip return Skip
} catch (e: Exception) {
Logger.e("Exception in onPreTransact uid=$callingUid pid=$callingPid!", e)
return Skip
} }
} }
} }