From c3bae57a75e81de8636a4b5eaf34c31d9366d02a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 9 Nov 2026 22:06:20 -0500 Subject: [PATCH] fix(native): a session's helpers keep the mode the session started in --- .../com/droiddeck/launcher/runtime/BwrapSpawner.kt | 2 +- .../com/droiddeck/launcher/runtime/GuestCommand.kt | 2 +- .../java/com/droiddeck/launcher/runtime/NativeGuest.kt | 10 ++++++++++ .../java/com/droiddeck/launcher/runtime/RootSpawner.kt | 2 +- .../com/droiddeck/launcher/session/SessionService.kt | 2 ++ .../java/com/droiddeck/launcher/stores/gog/GogComet.kt | 2 +- .../java/com/droiddeck/launcher/stores/xbox/Xodus.kt | 2 +- 7 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt index aa8dad033..3e8307599 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -492,7 +492,7 @@ object BwrapSpawner { private fun run(context: Context, plan: Plan, client: LocalSocket, out: DataOutputStream, id: Int) { val verbose = plan.env["DROIDDECK_PROOT_VERBOSE"]?.toIntOrNull() - val native = if (NativeGuest.enabled(context)) nativeLaunch(context, plan) else null + val native = if (NativeGuest.forSession(context)) nativeLaunch(context, plan) else null val builder = if (native != null) { ProcessBuilder(native.first).redirectErrorStream(true) .directory(File(hostPath(plan.binds, plan.root.path, plan.cwd)).takeIf { it.isDirectory } ?: plan.root) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 3653b4c99..0560752a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -36,7 +36,7 @@ object GuestCommand { LinuxNetworkLinkComponent(context, root).publish() val runtimeDir = File(context.filesDir, ".flatpak-rt").apply { mkdirs() } val binds = LinuxRuntime.binds(context, null, runtimeDir, Environment.getExternalStorageDirectory(), extraBinds) - val native = NativeGuest.enabled(context) + val native = NativeGuest.forSession(context) val fastPathKey = if (!native && fastPath && !fakeRoot && linkDir == null && ProotFastPath.enabled(context)) ProotFastPath.key(root, binds) else null val guest = mutableListOf( "/usr/bin/env", "-i", "HOME=/root", "USER=root", "LANG=C.UTF-8", diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt b/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt index 71c686c38..ae4106a08 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt @@ -24,6 +24,16 @@ object NativeGuest { fun enabled(context: Context): Boolean = SessionPrefs.nativeUserland(context) && available(LinuxRuntime.rootDir(context)) + /** The mode the running session started in; null between sessions. */ + @Volatile var sessionMode: Boolean? = null + + /** + * Whether a session's helpers (root commands, Flatpak sandboxes, installers) run natively: the + * session's own mode while one runs, as the setting can change under it and the rootfs is only + * prepared for native programs at a session's start. + */ + fun forSession(context: Context): Boolean = sessionMode ?: enabled(context) + /** * Development switch: etc/droiddeck/seccomp-sim names a helper (a guest path, then its arguments) * that applies Android's app seccomp filter before the program starts, for devices that run apps 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 b9b4365a9..a96ff46f3 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt @@ -117,7 +117,7 @@ object RootSpawner { val guest = mutableListOf("/usr/bin/env", "-i") request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> guest.add("$k=${e.getString(k)}") } } guest.addAll(argv) - val builder = if (NativeGuest.enabled(context)) { + val builder = if (NativeGuest.forSession(context)) { NativeGuest.processBuilder(context, root, binds, guest, cwd) } else { val cmd = LinuxRuntime.prootPrefix(context, root, cwd, true) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 28e92c672..39e3c2541 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -666,6 +666,7 @@ class SessionService : Service() { val binds = sessionBinds(controllersOn, fakeInputDir, sessionDir, guest, sessionRoot, runtimeDir) val nativeUserland = com.droiddeck.launcher.runtime.NativeGuest.enabled(this) + com.droiddeck.launcher.runtime.NativeGuest.sessionMode = nativeUserland val fastPathKey = if (ProotFastPath.enabled(this)) { val prootBinds = LinuxRuntime.binds( this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds, @@ -772,6 +773,7 @@ class SessionService : Service() { } val program = programStatus(sessionRoot) Log.i(TAG, "session ended: $status" + if (program != null) " (program $program)" else "") + com.droiddeck.launcher.runtime.NativeGuest.sessionMode = null stopSession(program ?: status ?: -1, gen) }, null, sessionLog.takeIf { "PROOT_PROFILE=1" in hostEnv.asArray() }) Log.i(TAG, "session pid $pid, log ${sessionLog.path}") diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt index fd9b81778..8ad240e65 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt @@ -140,7 +140,7 @@ object GogComet { val data = File(context.filesDir, "gog-achievements").apply { mkdirs() } val ready = CountDownLatch(1) val guest = listOf("/usr/bin/env", "HOME=/root", "XDG_DATA_HOME=${data.path}/data", "XDG_CONFIG_HOME=${data.path}/config", "COMET_LOG=off", "COMET_ALLOWED_CLIENTS=${policy.path}", BIN, "--credentials-stdin") - val pb = if (com.droiddeck.launcher.runtime.NativeGuest.enabled(context)) { + val pb = if (com.droiddeck.launcher.runtime.NativeGuest.forSession(context)) { val root = LinuxRuntime.rootDir(context) com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, LinuxRuntime.binds(context, null, null, Environment.getExternalStorageDirectory(), null), guest).redirectErrorStream(true) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt index 298b1bbef..f27794d1b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt @@ -88,7 +88,7 @@ internal object Xodus { val fastPathPreloaded = runCatching { File(root, "etc/ld.so.preload").useLines { lines -> lines.any { it.trim() == ProotFastPath.LIBRARY } } }.getOrDefault(false) - val native = com.droiddeck.launcher.runtime.NativeGuest.enabled(app) + val native = com.droiddeck.launcher.runtime.NativeGuest.forSession(app) val fastPathKey = if (!native && ProotFastPath.enabled(app) && fastPathPreloaded && File(root, ProotFastPath.LIBRARY.removePrefix("/")).isFile) ProotFastPath.key(root, binds) else null val guestCommand = mutableListOf(