From 979c51009c8a721e63b905bdf0e625c255f8f844 Mon Sep 17 00:00:00 2001
From: 5ec1cff <ewtqyqyewtqyqy@gmail.com>
Date: Thu, 18 Jul 2024 12:48:45 +0800
Subject: [PATCH] refine

---
 module/template/customize.sh                       | 14 +++++++-------
 .../a13e300/tricky_store/KeystoreInterceptor.kt    |  7 ++++---
 .../tricky_store/binder/BinderInterceptor.kt       |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/module/template/customize.sh b/module/template/customize.sh
index 0f203f6..eccb35e 100644
--- a/module/template/customize.sh
+++ b/module/template/customize.sh
@@ -60,7 +60,6 @@ fi
 . "$TMPDIR/verify.sh"
 extract "$ZIPFILE" 'customize.sh'  "$TMPDIR/.vunzip"
 extract "$ZIPFILE" 'verify.sh'     "$TMPDIR/.vunzip"
-extract "$ZIPFILE" 'target.txt'    "$TMPDIR"
 
 ui_print "- Extracting module files"
 extract "$ZIPFILE" 'module.prop'     "$MODPATH"
@@ -68,7 +67,8 @@ extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH"
 extract "$ZIPFILE" 'service.sh'      "$MODPATH"
 extract "$ZIPFILE" 'service.apk'     "$MODPATH"
 extract "$ZIPFILE" 'sepolicy.rule'   "$MODPATH"
-chmod +x "$MODPATH/daemon"
+extract "$ZIPFILE" 'daemon'          "$MODPATH"
+chmod 755 "$MODPATH/daemon"
 
 mkdir "$MODPATH/zygisk"
 
@@ -90,12 +90,12 @@ mv "$MODPATH/libinject.so" "$MODPATH/inject"
 chmod 755 "$MODPATH/inject"
 
 CONFIG_DIR=/data/adb/tricky_store
-if [ ! -d $CONFIG_DIR ]; then
+if [ ! -d "$CONFIG_DIR" ]; then
   ui_print "- Creating configuration directory"
-  mkdir -p $CONFIG_DIR
-  if [ ! -f $CONFIG_DIR/target.txt ]; then
+  mkdir -p "$CONFIG_DIR"
+  if [ ! -f "$CONFIG_DIR/target.txt" ]; then
     ui_print "- Adding default scope"
-    extract "$ZIPFILE" 'daemon'          "$MODPATH"
-    mv "$TMPDIR/target.txt"
+    extract "$ZIPFILE" 'target.txt' "$TMPDIR"
+    mv "$TMPDIR/target.txt" "$CONFIG_DIR/target.txt"
   fi
 fi
diff --git a/service/src/main/java/io/github/a13e300/tricky_store/KeystoreInterceptor.kt b/service/src/main/java/io/github/a13e300/tricky_store/KeystoreInterceptor.kt
index caa3e96..3772d26 100644
--- a/service/src/main/java/io/github/a13e300/tricky_store/KeystoreInterceptor.kt
+++ b/service/src/main/java/io/github/a13e300/tricky_store/KeystoreInterceptor.kt
@@ -42,7 +42,7 @@ object KeystoreInterceptor : BinderInterceptor() {
                         val response =
                             SecurityLevelInterceptor.getKeyResponse(callingUid, descriptor.alias)
                             ?: return@runCatching
-                        Logger.i("use generated key $callingUid ${descriptor.alias}")
+                        Logger.i("generate key for uid=$callingUid alias=${descriptor.alias}")
                         val p = Parcel.obtain()
                         p.writeNoException()
                         p.writeTypedObject(response, 0)
@@ -75,6 +75,7 @@ object KeystoreInterceptor : BinderInterceptor() {
             if (chain != null) {
                 val newChain = CertHack.hackCertificateChain(chain)
                 Utils.putCertificateChain(response, newChain)
+                Logger.i("hacked cert of uid=$callingUid")
                 p.writeNoException()
                 p.writeTypedObject(response, 0)
                 return OverrideReply(0, p)
@@ -92,13 +93,13 @@ object KeystoreInterceptor : BinderInterceptor() {
     private var injected = false
 
     fun tryRunKeystoreInterceptor(): Boolean {
-        Logger.i("trying to register keystore interceptor ...")
+        Logger.i("trying to register keystore interceptor ($triedCount) ...")
         val b = ServiceManager.getService("android.system.keystore2.IKeystoreService/default") ?: return false
         val bd = getBinderBackdoor(b)
         if (bd == null) {
             // no binder hook, try inject
             if (triedCount >= 3) {
-                Logger.e("inject tried but still has no backdoor, exit")
+                Logger.e("tried injection but still has no backdoor, exit")
                 exitProcess(1)
             }
             if (!injected) {
diff --git a/service/src/main/java/io/github/a13e300/tricky_store/binder/BinderInterceptor.kt b/service/src/main/java/io/github/a13e300/tricky_store/binder/BinderInterceptor.kt
index 680bc38..c35db10 100644
--- a/service/src/main/java/io/github/a13e300/tricky_store/binder/BinderInterceptor.kt
+++ b/service/src/main/java/io/github/a13e300/tricky_store/binder/BinderInterceptor.kt
@@ -18,7 +18,7 @@ open class BinderInterceptor : Binder() {
             val reply = Parcel.obtain()
             try {
                 if (!b.transact(0xdeadbeef.toInt(), data, reply, 0)) {
-                    Logger.e("remote return false!")
+                    Logger.d("remote return false!")
                     return null
                 }
                 Logger.d("remote return true!")