Migrate self-hooking VPN hide module to libxposed API 101

Author: 1392726643

app/build.gradle.kts

@@ -323,7 +323,7 @@ dependencies {
 
     // Xposed API for self-hooking VPN hide module
     compileOnly("de.robv.android.xposed:api:82")
-    compileOnly(project(":libxposed-api"))
+    compileOnly("io.github.libxposed:api:101.0.1")
 }
 
 val playCredentialsJSON = rootProject.file("service-account-credentials.json")

app/src/main/java/io/nekohasekai/sfa/xposed/HookInstaller.kt

@@ -1,6 +1,5 @@
 package io.nekohasekai.sfa.xposed
 
-import android.content.Context
 import io.nekohasekai.sfa.xposed.hooks.HookIConnectivityManagerOnTransact
 import io.nekohasekai.sfa.xposed.hooks.hidevpn.ConnectivityServiceHookHelper
 import io.nekohasekai.sfa.xposed.hooks.hidevpn.HookNetworkCapabilitiesWriteToParcel
@@ -11,16 +10,11 @@ object HookInstaller {
 
     private const val TAG = "XposedInit"
 
-    private val activityThreadClass by lazy { Class.forName("android.app.ActivityThread") }
-    private val currentActivityThreadMethod by lazy { activityThreadClass.getMethod("currentActivityThread") }
-    private val getSystemContextMethod by lazy { activityThreadClass.getMethod("getSystemContext") }
-
     fun install(classLoader: ClassLoader) {
-        val systemContext = resolveSystemContext()
-        HookErrorStore.i(TAG, "handleSystemServerLoaded")
+        HookErrorStore.i(TAG, "handleSystemServerStarting")
         val hooks = arrayOf(
             ConnectivityServiceHookHelper(classLoader),
-            HookIConnectivityManagerOnTransact(classLoader, systemContext),
+            HookIConnectivityManagerOnTransact(classLoader),
             HookPackageManagerGetInstalledPackages(classLoader),
             HookNetworkCapabilitiesWriteToParcel(),
             HookNetworkInterfaceGetName(classLoader),
@@ -38,12 +32,4 @@ object HookInstaller {
             }
         }
     }
-
-    private fun resolveSystemContext(): Context? = try {
-        val currentThread = currentActivityThreadMethod.invoke(null)
-        getSystemContextMethod.invoke(currentThread) as? Context
-    } catch (e: Throwable) {
-        HookErrorStore.e(TAG, "resolveSystemContext failed", e)
-        null
-    }
 }

app/src/main/java/io/nekohasekai/sfa/xposed/XposedInit.kt

@@ -1,12 +1,16 @@
 package io.nekohasekai.sfa.xposed
 
-import io.github.libxposed.api.XposedInterface
 import io.github.libxposed.api.XposedModule
-import io.github.libxposed.api.XposedModuleInterface
+import io.github.libxposed.api.XposedModuleInterface.ModuleLoadedParam
+import io.github.libxposed.api.XposedModuleInterface.SystemServerStartingParam
 
-class XposedInit(base: XposedInterface, param: XposedModuleInterface.ModuleLoadedParam) : XposedModule(base, param) {
+class XposedInit : XposedModule() {
 
-    override fun onSystemServerLoaded(param: XposedModuleInterface.SystemServerLoadedParam) {
+    override fun onModuleLoaded(param: ModuleLoadedParam) {
+        HookErrorStore.i("XposedInit", "onModuleLoaded process=${param.processName} system=${param.isSystemServer}")
+    }
+
+    override fun onSystemServerStarting(param: SystemServerStartingParam) {
         HookInstaller.install(param.classLoader)
     }
 

app/src/main/java/io/nekohasekai/sfa/xposed/XposedInit101.kt

@@ -1,6 +1,5 @@
 package io.nekohasekai.sfa.xposed.hooks
 
-import android.content.Context
 import android.content.pm.PackageInfo
 import android.os.Binder
 import android.os.Parcel
@@ -12,8 +11,9 @@ import io.nekohasekai.sfa.xposed.HookErrorStore
 import io.nekohasekai.sfa.xposed.HookStatusKeys
 import io.nekohasekai.sfa.xposed.HookStatusStore
 import io.nekohasekai.sfa.xposed.PrivilegeSettingsStore
+import io.nekohasekai.sfa.xposed.VpnAppStore
 
-class HookIConnectivityManagerOnTransact(private val classLoader: ClassLoader, private val context: Context?) : XHook {
+class HookIConnectivityManagerOnTransact(private val classLoader: ClassLoader) : XHook {
     private companion object {
         private const val SOURCE = "HookIConnectivityManagerOnTransact"
     }
@@ -109,17 +109,8 @@ class HookIConnectivityManagerOnTransact(private val classLoader: ClassLoader, p
     private fun isCallerAllowed(): Boolean {
         val uid = Binder.getCallingUid()
         if (uid == 0) return true
-        val pm = context?.packageManager
-        if (pm == null) {
-            HookErrorStore.e(SOURCE, "isCallerAllowed: context or packageManager is null, uid=$uid")
-            return false
-        }
         return try {
-            val packages = pm.getPackagesForUid(uid)
-            if (packages == null) {
-                HookErrorStore.w(SOURCE, "isCallerAllowed: getPackagesForUid returned null for uid=$uid")
-                return false
-            }
+            val packages = VpnAppStore.getPackagesForUid(uid)
             packages.any { it == BuildConfig.APPLICATION_ID }
         } catch (e: Throwable) {
             HookErrorStore.e(SOURCE, "isCallerAllowed failed for uid=$uid", e)

app/src/main/java/io/nekohasekai/sfa/xposed/hooks/IConnectivityManager+onTransact.kt

@@ -1,2 +1 @@
 io.nekohasekai.sfa.xposed.XposedInit
-io.nekohasekai.sfa.xposed.XposedInit101

app/src/main/resources/META-INF/xposed/java_init.list

@@ -1,3 +1,3 @@
-minApiVersion=100
+minApiVersion=101
 targetApiVersion=101
 staticScope=true

app/src/main/resources/META-INF/xposed/module.prop

@@ -16,5 +16,3 @@ dependencyResolutionManagement {
 }
 rootProject.name = "sing-box"
 include(":app")
-include(":libxposed-api")
-project(":libxposed-api").projectDir = file("third_party/libxposed-api")