fix: fix various bugs with starting the system bridge due to native libraries not being found

Author: sds100

sysbridge/src/main/cpp/starter.cpp

@@ -97,7 +97,7 @@ v_current = (uintptr_t) v + v_size - sizeof(char *); \
     ARG_PUSH_FMT(argv, "-Djava.class.path=%s", apk_path)
     ARG_PUSH_FMT(argv, "-Dkeymapper_sysbridge.library.path=%s", lib_path)
     ARG_PUSH_FMT(argv, "-Dkeymapper_sysbridge.package=%s", package_name)
-    ARG_PUSH_FMT(argv, "-Dkeymapper_sysbridge.version_code=%s", version_code)
+    ARG_PUSH_FMT(argv, "-Dkeymapper_sysbridge.version=%s", version_code)
     ARG_PUSH_DEBUG_VM_PARAMS(argv)
     ARG_PUSH(argv, "/system/bin")
     ARG_PUSH_FMT(argv, "--nice-name=%s", process_name)
@@ -120,7 +120,7 @@ static void start_server(const char *apk_path, const char *lib_path, const char
         LOGD("child");
         run_server(apk_path, lib_path, main_class, process_name, package_name, version_code);
     } else {
-        perrorf("fatal: can't fork\n");
+        LOGE("fatal: can't fork");
         exit(EXIT_FATAL_FORK);
     }
 }
@@ -130,8 +130,7 @@ static int check_selinux(const char *s, const char *t, const char *c, const char
 #ifndef DEBUG
     if (res != 0) {
 #endif
-    printf("info: selinux_check_access %s %s %s %s: %d\n", s, t, c, p, res);
-    fflush(stdout);
+    LOGI("selinux_check_access %s %s %s %s: %d", s, t, c, p, res);
 #ifndef DEBUG
     }
 #endif
@@ -143,28 +142,23 @@ static int switch_cgroup() {
     int spid = getpid();
 
     if (cgroup::get_cgroup(spid, &s_cuid, &s_cpid) != 0) {
-        printf("warn: can't read cgroup\n");
-        fflush(stdout);
+        LOGW("can't read cgroup");
         return -1;
     }
 
-    printf("info: cgroup is /uid_%d/pid_%d\n", s_cuid, s_cpid);
-    fflush(stdout);
+    LOGI("cgroup is /uid_%d/pid_%d", s_cuid, s_cpid);
 
     if (cgroup::switch_cgroup(spid, -1, -1) != 0) {
-        printf("warn: can't switch cgroup\n");
-        fflush(stdout);
+        LOGW("can't switch cgroup");
         return -1;
     }
 
     if (cgroup::get_cgroup(spid, &s_cuid, &s_cpid) != 0) {
-        printf("info: switch cgroup succeeded\n");
-        fflush(stdout);
+        LOGI("switch cgroup succeeded");
         return 0;
     }
 
-    printf("warn: can't switch self, current cgroup is /uid_%d/pid_%d\n", s_cuid, s_cpid);
-    fflush(stdout);
+    LOGW("can't switch self, current cgroup is /uid_%d/pid_%d", s_cuid, s_cpid);
     return -1;
 }
 
@@ -174,7 +168,7 @@ int starter_main(int argc, char *argv[]) {
     char *apk_path = nullptr;
     char *lib_path = nullptr;
     char *package_name = nullptr;
-    char *version_code = nullptr;
+    char *version = nullptr;
 
     // Get the apk path from the program arguments. This gets the path by setting the
     // start of the apk path array to after the "--apk=" by offsetting by 6 characters.
@@ -185,19 +179,19 @@ int starter_main(int argc, char *argv[]) {
             lib_path = argv[i] + 6;
         } else if (strncmp(argv[i], "--package=", 10) == 0) {
             package_name = argv[i] + 10;
-        } else if (strncmp(argv[i], "--version_code=", 15) == 0) {
-            version_code = argv[i] + 15;
+        } else if (strncmp(argv[i], "--version=", 10) == 0) {
+            version = argv[i] + 10;
         }
     }
 
-    printf("info: apk path = %s\n", apk_path);
-    printf("info: lib path = %s\n", lib_path);
-    printf("info: package name = %s\n", package_name);
-    printf("info: version code = %s\n", version_code);
+    LOGI("apk path = %s", apk_path);
+    LOGI("lib path = %s", lib_path);
+    LOGI("package name = %s", package_name);
+    LOGI("version = %s", version);
 
     int uid = getuid();
     if (uid != 0 && uid != 2000) {
-        perrorf("fatal: run system bridge from non root nor adb user (uid=%d).\n", uid);
+        LOGE("fatal: run system bridge from non root nor adb user (uid=%d).", uid);
         exit(EXIT_FATAL_UID);
     }
 
@@ -215,7 +209,7 @@ int starter_main(int argc, char *argv[]) {
             sdkLevel = atoi(buf);
 
         if (sdkLevel >= 29) {
-            printf("info: switching mount namespace to init...\n");
+            LOGI("switching mount namespace to init...");
             switch_mnt_ns(1);
         }
     }
@@ -228,27 +222,18 @@ int starter_main(int argc, char *argv[]) {
             res |= check_selinux("u:r:untrusted_app:s0", context, "binder", "transfer");
 
             if (res != 0) {
-                perrorf("fatal: the su you are using does not allow app (u:r:untrusted_app:s0) to connect to su (%s) with binder.\n",
+                LOGE("fatal: the su you are using does not allow app (u:r:untrusted_app:s0) to connect to su (%s) with binder.",
                         context);
                 exit(EXIT_FATAL_BINDER_BLOCKED_BY_SELINUX);
             }
             se::freecon(context);
         }
     }
 
-    mkdir("/data/local/tmp/keymapper_sysbridge", 0707);
-    chmod("/data/local/tmp/keymapper_sysbridge", 0707);
-    if (uid == 0) {
-        chown("/data/local/tmp/keymapper_sysbridge", 2000, 2000);
-        se::setfilecon("/data/local/tmp/keymapper_sysbridge", "u:object_r:shell_data_file:s0");
-    }
-
-    printf("info: starter begin\n");
-    fflush(stdout);
+    LOGI("starter begin");
 
     // kill old server
-    printf("info: killing old process...\n");
-    fflush(stdout);
+    LOGI("killing old process...");
 
     foreach_proc([](pid_t pid) {
         if (pid == getpid()) return;
@@ -259,47 +244,42 @@ int starter_main(int argc, char *argv[]) {
         if (strcmp(SERVER_NAME, name) != 0) return;
 
         if (kill(pid, SIGKILL) == 0)
-            printf("info: killed %d (%s)\n", pid, name);
+            LOGI("killed %d (%s)", pid, name);
         else if (errno == EPERM) {
-            perrorf("fatal: can't kill %d, please try to stop existing sysbridge from app first.\n",
+            LOGE("fatal: can't kill %d, please try to stop existing sysbridge from app first.",
                     pid);
             exit(EXIT_FATAL_KILL);
         } else {
-            printf("warn: failed to kill %d (%s)\n", pid, name);
+            LOGW("failed to kill %d (%s)", pid, name);
         }
     });
 
     if (access(apk_path, R_OK) == 0) {
-        printf("info: use apk path from argv\n");
-        fflush(stdout);
+        LOGI("use apk path from argv");
     }
 
     if (access(lib_path, R_OK) == 0) {
-        printf("info: use lib path from argv\n");
-        fflush(stdout);
+        LOGI("use lib path from argv");
     }
 
     if (!apk_path) {
-        perrorf("fatal: can't get path of manager\n");
+        LOGE("fatal: can't get path of manager");
         exit(EXIT_FATAL_PM_PATH);
     }
 
     if (!lib_path) {
-        perrorf("fatal: can't get path of native libraries\n");
+        LOGE("fatal: can't get path of native libraries");
         exit(EXIT_FATAL_PM_PATH);
     }
 
-    printf("info: apk path is %s\n", apk_path);
-    printf("info: lib path is %s\n", lib_path);
     if (access(apk_path, R_OK) != 0) {
-        perrorf("fatal: can't access manager %s\n", apk_path);
+        LOGE("fatal: can't access manager %s", apk_path);
         exit(EXIT_FATAL_PM_PATH);
     }
 
-    printf("info: starting server...\n");
-    fflush(stdout);
+    LOGI("starting server...");
     LOGD("start_server");
-    start_server(apk_path, lib_path, SERVER_CLASS_PATH, SERVER_NAME, package_name, version_code);
+    start_server(apk_path, lib_path, SERVER_CLASS_PATH, SERVER_NAME, package_name, version);
     exit(EXIT_SUCCESS);
 }
 

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/adb/AdbClient.kt

@@ -110,7 +110,7 @@ internal class AdbClient(private val host: String, private val port: Int, privat
         return Success(Unit)
     }
 
-    fun shellCommand(command: String): ByteArray {
+    fun shellCommand(command: String, listener: (ByteArray) -> Unit) {
         val localId = 1
         write(A_OPEN, localId, 0, "shell:$command")
 
@@ -119,10 +119,11 @@ internal class AdbClient(private val host: String, private val port: Int, privat
             A_OKAY -> {
                 while (true) {
                     message = read()
+
                     val remoteId = message.arg0
                     if (message.command == A_WRTE) {
                         if (message.data_length > 0) {
-                            return message.data!!
+                            listener(message.data!!)
                         }
                         write(A_OKAY, localId, remoteId)
                     } else if (message.command == A_CLSE) {
@@ -143,8 +144,6 @@ internal class AdbClient(private val host: String, private val port: Int, privat
                 error("not A_OKAY or A_CLSE")
             }
         }
-
-        error("No response from adb?")
     }
 
     private fun write(command: Int, arg0: Int, arg1: Int, data: ByteArray? = null) = write(
@@ -167,7 +166,7 @@ internal class AdbClient(private val host: String, private val port: Int, privat
 
     private fun read(): AdbMessage {
         val buffer =
-            ByteBuffer.allocate(AdbMessage.Companion.HEADER_LENGTH).order(ByteOrder.LITTLE_ENDIAN)
+            ByteBuffer.allocate(AdbMessage.HEADER_LENGTH).order(ByteOrder.LITTLE_ENDIAN)
 
         inputStream.readFully(buffer.array(), 0, 24)
 

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/adb/AdbManager.kt

@@ -56,14 +56,18 @@ class AdbManagerImpl @Inject constructor(
 
                 return@withLock with(client) {
                     connect().then {
-                        try {
-                            client.shellCommand(command).success()
-                        } catch (e: Exception) {
-                            Timber.e(e)
-                            AdbError.Unknown(e)
+                        val output = buildString {
+                            try {
+                                client.shellCommand(command) { append(String(it)) }
+                            } catch (e: Exception) {
+                                Timber.e(e)
+                                AdbError.Unknown(e)
+                            }
                         }
+
+                        Success(output)
                     }
-                }.then { String(it).success() }
+                }
             }
         }
 

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/service/SystemBridge.kt

@@ -67,11 +67,13 @@ internal class SystemBridge : ISystemBridge.Stub() {
 
     companion object {
         private const val TAG: String = "KeyMapperSystemBridge"
-        private val systemBridgePackageName: String? =
+        private val systemBridgePackageName: String? by lazy {
             System.getProperty("keymapper_sysbridge.package")
+        }
 
-        private val systemBridgeVersionCode: Int =
-            System.getProperty("keymapper_sysbridge.version_code")!!.toInt()
+        private val systemBridgeVersionCode: Int by lazy {
+            System.getProperty("keymapper_sysbridge.version")?.toIntOrNull() ?: -1
+        }
 
         private const val KEYMAPPER_CHECK_INTERVAL_MS = 60 * 1000L // 1 minute
         private const val DATA_ENABLED_REASON_USER: Int = 0
@@ -140,7 +142,7 @@ internal class SystemBridge : ISystemBridge.Stub() {
     private val sendBinderLock: Any = Any()
 
     private val coroutineScope: CoroutineScope = MainScope()
-    private val mainHandler = Handler(Looper.myLooper()!!)
+    private val mainHandler by lazy { Handler(Looper.myLooper()!!) }
 
     private val keyMapperCheckLock: Any = Any()
     private var keyMapperCheckJob: Job? = null
@@ -175,18 +177,24 @@ internal class SystemBridge : ISystemBridge.Stub() {
     }
 
     init {
+        if (versionCode == -1) {
+            Log.e(TAG, "SystemBridge version code not set")
+            throw IllegalStateException("SystemBridge version code not set")
+        }
+
         val libraryPath = System.getProperty("keymapper_sysbridge.library.path")
         @SuppressLint("UnsafeDynamicallyLoadedCode")
         System.load("$libraryPath/libevdev.so")
 
         Log.i(TAG, "SystemBridge starting... Version code $versionCode")
 
-        waitSystemService("package")
-        packageManager = IPackageManager.Stub.asInterface(ServiceManager.getService("package"))
-
         waitSystemService(Context.ACTIVITY_SERVICE)
         waitSystemService(Context.USER_SERVICE)
         waitSystemService(Context.APP_OPS_SERVICE)
+
+        waitSystemService("package")
+        packageManager = IPackageManager.Stub.asInterface(ServiceManager.getService("package"))
+
         waitSystemService("permissionmgr")
         permissionManager =
             IPermissionManager.Stub.asInterface(ServiceManager.getService("permissionmgr"))

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/service/SystemBridgeSetupController.kt

@@ -239,7 +239,9 @@ class SystemBridgeSetupControllerImpl @Inject constructor(
                 }
 
                 // Try running a command to see if the pairing is working correctly.
-                isAdbPairedResult.value = adbManager.executeCommand("sh").isSuccess
+                // This will execute the "exit" command in the shell so it immediately closes
+                // the connection.
+                isAdbPairedResult.value = adbManager.executeCommand("exit").isSuccess
             }
         }