From 33dbd8755fba83be48ad0cbd9b1cb2d359abf0ee Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 08:48:23 -0500 Subject: [PATCH] fix(agent): run the setup package install as fake root (#2539) --- .../com/droiddeck/launcher/agent/AgentHost.kt | 7 +-- .../droiddeck/launcher/agent/AgentSetup.kt | 6 ++- .../launcher/runtime/LinuxRuntime.java | 21 +++++++- .../droiddeck/launcher/runtime/RootSpawner.kt | 3 +- .../launcher/agent/AgentGuestPathTest.kt | 18 +++++++ .../launcher/agent/AgentSetupRootTest.kt | 10 ++++ .../runtime/LinuxRuntimeRootPrefixTest.kt | 54 +++++++++++++++++++ 7 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index aa369a6883..1f78672f4a 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -52,6 +52,7 @@ object AgentHost { private const val TAG = "AgentHost" private const val WORKSPACE = "/root/DroidDeck" + internal const val GUEST_PATH = "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" private const val TICK_MS = 1_000L private const val IDLE_TICK_MS = 5_000L @@ -377,10 +378,10 @@ object AgentHost { * proot over the installed rootfs, without a session. Loopback adb is connected first so * droiddeckctl reaches the app. */ - fun guest(app: Context, command: List, workdir: String = "/root", connectAdb: Boolean = true): ProcessBuilder { + fun guest(app: Context, command: List, workdir: String = "/root", connectAdb: Boolean = true, fakeRoot: Boolean = false): ProcessBuilder { val adb = AgentAdb.prepare(app) val env = listOf( - "/usr/bin/env", "HOME=/root", "PATH=/root/.local/bin:/usr/local/bin:/usr/bin:/bin", "LANG=C.UTF-8", + "/usr/bin/env", "HOME=/root", "PATH=$GUEST_PATH", "LANG=C.UTF-8", "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", "DD_AGENT=1", "DD_AGENT_INBOX=${File(app.filesDir, "agent").path}", "BROWSER=/root/.local/bin/android-open", "DD_BROWSER_DISPLAY=${AgentAdb.browserDisplay}", ) @@ -390,7 +391,7 @@ object AgentHost { (if (connectAdb) "adb start-server >/dev/null 2>&1; adb connect \"\$ADB_SERIAL\" >/dev/null 2>&1; " else "") + "cd \"$1\" 2>/dev/null; shift; exec \"$@\"", "sh", workdir, ) - val proot = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), env + shell + command) + val proot = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), null, env + shell + command, fakeRoot) return ProcessBuilder(proot).redirectErrorStream(true).apply { environment().apply { remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index 754dfa2ea9..a5f900d6f5 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -73,6 +73,8 @@ object AgentSetup { Thread({ for ((step, command) in probes) probe(app, harness, step, command) }, "agent-checks").start() } + fun runsAsRoot(step: Step) = step == Step.INSTALL + /** Runs [step]'s action. [CONNECTION] is the app's own pairing flow, so the caller opens it. */ fun run(context: Context, step: Step) { val app = context.applicationContext @@ -81,7 +83,7 @@ object AgentSetup { Step.CONNECTION -> return Step.INSTALL -> { listOf("sh", "-c", "set -e; export DEBIAN_FRONTEND=noninteractive; " + - "dpkg --configure -a; apt-get update; apt-get -f install -y; " + + "dpkg --configure -a; apt-get update || echo 'Some package sources could not be refreshed; continuing'; apt-get -f install -y; " + "apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") } Step.SIGN_IN -> harness.signIn @@ -97,7 +99,7 @@ object AgentSetup { val result = runCatching { installHelpers(app) runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } - val child = AgentHost.guest(app, command).start() + val child = AgentHost.guest(app, command, fakeRoot = runsAsRoot(step)).start() val pid = AgentProcesses.pidOf(child) OrphanReaper.keep(pid) try { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 0253604021..0e5c2d6715 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -139,15 +139,26 @@ public final class LinuxRuntime { public static List command(Context context, File sessionRoot, File runtimeDir, File externalStorage, List extraBinds, List guestCommand) { + return command(context, sessionRoot, runtimeDir, externalStorage, extraBinds, guestCommand, false); + } + + public static List command(Context context, File sessionRoot, File runtimeDir, + File externalStorage, List extraBinds, + List guestCommand, boolean fakeRoot) { File root = rootDir(context); List binds = binds(context, sessionRoot, runtimeDir, externalStorage, extraBinds); if (sessionRoot != null) lastBinds = binds; - return commandWithBinds(context, root, binds, guestCommand); + return commandWithBinds(context, root, binds, guestCommand, fakeRoot); } public static List commandWithBinds(Context context, File root, List binds, List guestCommand) { - List cmd = prootPrefix(context, root, "/root"); + return commandWithBinds(context, root, binds, guestCommand, false); + } + + public static List commandWithBinds(Context context, File root, List binds, + List guestCommand, boolean fakeRoot) { + List cmd = fakeRoot ? rootPrefix(context, root, "/root") : prootPrefix(context, root, "/root"); for (String spec : binds) bind(cmd, spec); cmd.addAll(guestCommand); return cmd; @@ -170,6 +181,12 @@ public final class LinuxRuntime { return prootPrefix(context, root, cwd, false); } + public static List rootPrefix(Context context, File root, String cwd) { + List cmd = prootPrefix(context, root, cwd, true); + cmd.add(1, "--link2symlink"); + return cmd; + } + public static List prootPrefix(Context context, File root, String cwd, boolean fakeRoot) { List cmd = new ArrayList<>(); cmd.add(prootBinary(context).getPath()); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt index a96ff46f38..16228be728 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt @@ -120,8 +120,7 @@ object RootSpawner { val builder = if (NativeGuest.forSession(context)) { NativeGuest.processBuilder(context, root, binds, guest, cwd) } else { - val cmd = LinuxRuntime.prootPrefix(context, root, cwd, true) - cmd.add(1, "--link2symlink") + val cmd = LinuxRuntime.rootPrefix(context, root, cwd) binds.forEach { cmd.add("-b"); cmd.add(it) } cmd.addAll(guest) ProcessBuilder(cmd).directory(root).also { b -> diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt new file mode 100644 index 0000000000..794a0e95f4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class AgentGuestPathTest { + private val dirs = AgentHost.GUEST_PATH.split(':') + + @Test fun includesTheSystemBinariesDpkgNeedsAsRoot() { + assertTrue(dirs.containsAll(listOf("/usr/local/sbin", "/usr/sbin", "/sbin"))) + } + + @Test fun keepsUserBinariesFirstAndTheStandardDirs() { + assertEquals("/root/.local/bin", dirs.first()) + assertTrue(dirs.containsAll(listOf("/usr/local/bin", "/usr/bin", "/bin"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt new file mode 100644 index 0000000000..5e5c1656c2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt @@ -0,0 +1,10 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Test + +class AgentSetupRootTest { + @Test fun onlyThePackageInstallRunsAsRoot() { + assertEquals(listOf(AgentSetup.Step.INSTALL), AgentSetup.Step.values().filter { AgentSetup.runsAsRoot(it) }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt new file mode 100644 index 0000000000..e956781db9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import android.system.Os +import android.system.StructUtsname +import androidx.test.core.app.ApplicationProvider +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.annotation.Implementation +import org.robolectric.annotation.Implements +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE, application = Application::class, shadows = [LinuxRuntimeRootPrefixTest.Uname::class]) +class LinuxRuntimeRootPrefixTest { + private val context: Application = ApplicationProvider.getApplicationContext() + private val root = File(context.filesDir, "rootfs") + private val guest = listOf("/usr/bin/dpkg", "--configure", "-a") + + @Test fun fakeRootEmulatesHardLinksForPackageManagers() { + val cmd = LinuxRuntime.commandWithBinds(context, root, emptyList(), guest, true) + assertTrue("-0" in cmd) + assertTrue("--link2symlink" in cmd) + assertFalse("-i" in cmd) + assertEquals(guest, cmd.takeLast(guest.size)) + } + + @Test fun rootSpawnerAndFakeRootCommandsShareOnePrefix() { + assertEquals(LinuxRuntime.rootPrefix(context, root, "/root"), + LinuxRuntime.commandWithBinds(context, root, emptyList(), emptyList(), true)) + } + + @Test fun userCommandsKeepTheAppUidAndRealLinks() { + val cmd = LinuxRuntime.commandWithBinds(context, root, emptyList(), guest) + val uid = android.os.Process.myUid() + assertFalse("-0" in cmd) + assertFalse("--link2symlink" in cmd) + assertEquals("$uid:$uid", cmd[cmd.indexOf("-i") + 1]) + assertEquals(LinuxRuntime.prootPrefix(context, root, "/root"), cmd.dropLast(guest.size)) + } + + @Implements(Os::class) + class Uname { + companion object { + @JvmStatic @Implementation + fun uname() = StructUtsname("Linux", "localhost", "6.1.0", "#1 SMP", "aarch64") + } + } +}