diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt index 0842f6b5a4..05d5d4e77b 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt @@ -18,7 +18,6 @@ object AgentEnv { private const val TAG = "AgentEnv" private const val FILE = "agent-env.json" private const val GUEST_BIN = "/opt/droiddeck-agent/bin" - private const val BASE_PATH = "/usr/local/bin:/usr/bin:/bin" private val NAME = Regex("[A-Za-z0-9._-]{1,64}") private val KEY = Regex("[A-Za-z_][A-Za-z0-9_]*") private val lock = Any() @@ -160,7 +159,7 @@ object AgentEnv { } private fun pathOf(lines: List) = - lines.lastOrNull { it.startsWith("PATH=") }?.substringAfter('=')?.takeIf { it.isNotBlank() } ?: BASE_PATH + lines.lastOrNull { it.startsWith("PATH=") }?.substringAfter('=')?.takeIf { it.isNotBlank() } ?: LinuxRuntime.GUEST_PATH private fun bin(context: Context): File { val root = LinuxRuntime.rootDir(context).canonicalFile.toPath() 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 01cbf93224..e2cc349aae 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -26,6 +26,7 @@ public final class LinuxRuntime { public static final String EXTRA_LINUX_MODE = "linux_mode"; private static final String KGSL_DEVICE = "/dev/kgsl-3d0"; public static final String GUEST_RUNTIME_DIR = "/run/droiddeck"; + public static final String GUEST_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"; private static final String SYSTEM_FONTS = "/system/fonts"; private static final String GUEST_SYSTEM_FONTS = "/usr/local/share/fonts/android"; public static final String DEBUG_LOG_DIR = "DroidDeck"; 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 e9d322b59f..a4498d78eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -781,7 +781,7 @@ class SessionService : Service() { guest.add("DROIDDECK_BWRAP_SOCKET=" + com.droiddeck.launcher.runtime.BwrapSpawner.socket(this)) guest.add("HOME=/root") guest.add("USER=root") - guest.add("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games") + guest.add("PATH=" + LinuxRuntime.GUEST_PATH) guest.add("TERM=xterm-256color") if (SessionState.mode == MODE_DESKTOP) { val appLocale = com.droiddeck.launcher.core.AppLanguage.effective(this) diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt index f625d6b41b..7fe76acc98 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt @@ -181,6 +181,32 @@ class AgentSecurityTest { assertEquals(listOf("TEST=old", "STICKY=1"), AgentEnv.beginSession(context)) } + @Test fun binaryOverridesPreserveTheRuntimeSearchPathForOneSession() { + AgentAccess.setCommandsEnabled(context, true) + File(AgentEnv.inbox(context).apply { mkdirs() }, "gamescope").writeText("test binary") + AgentEnv.override(context, "gamescope") + + val path = AgentEnv.beginSession(context).single { it.startsWith("PATH=") }.substringAfter('=') + assertEquals("/opt/droiddeck-agent/bin:" + LinuxRuntime.GUEST_PATH, path) + assertTrue(path.split(':').contains("/usr/games")) + assertTrue(path.split(':').contains("/usr/sbin")) + + AgentEnv.endSession(context) + assertTrue(AgentEnv.beginSession(context).none { it.startsWith("PATH=") }) + } + + @Test fun binaryOverridesKeepExplicitPathsAndPendingPathPrecedence() { + AgentAccess.setCommandsEnabled(context, true) + AgentEnv.set(context, listOf("PATH=/custom/persistent"), true) + AgentEnv.set(context, listOf("PATH=/custom/next:/usr/games"), false) + File(AgentEnv.inbox(context).apply { mkdirs() }, "gamescope").writeText("test binary") + AgentEnv.override(context, "gamescope") + + assertEquals("PATH=/opt/droiddeck-agent/bin:/custom/next:/usr/games", AgentEnv.beginSession(context).last()) + AgentEnv.endSession(context) + assertEquals(listOf("PATH=/custom/persistent"), AgentEnv.beginSession(context)) + } + @Test fun fastPathLibraryIsValidatedAndSelectedForOneSession() { AgentAccess.setCommandsEnabled(context, true) val source = File(AgentEnv.inbox(context).apply { mkdirs() }, "libblfastpath.so") diff --git a/docs/agent-control.md b/docs/agent-control.md index 0524e061ab..ff7d1bb493 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -39,6 +39,21 @@ Disabling the toggle clears queued and persistent agent environment settings and overrides. Disabled settings cannot apply at the next session start. Already running commands and effects already applied to a session are not undone; stop and restart that session to discard them. +Program overrides prepend their directory to the normal session PATH, including `/usr/games` +where Ubuntu installs `gamescopereaper`. An explicit `PATH=...` environment entry replaces that +default. If an old persistent PATH hides runtime tools, inspect `tools/droiddeckctl env list` +and correct only PATH with `env set --persistent`, which preserves other persistent entries. +For example, to restore the normal runtime search path: + +```sh +tools/droiddeckctl env set --persistent 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' +``` + +Retain any custom directories you still need alongside these runtime directories, then restart +the session. `env clear persistent` removes **all** persistent environment settings, not just +PATH; there is no single-entry clear operation. Before clearing that scope, record any other +entries you want to keep and reapply them afterward. + Authorized command execution runs inside the runtime containing Steam's saved login. CDP evaluates JavaScript in the authenticated Steam client, and preferences can contain private values. These capabilities remain unrestricted when enabled: the toggle is an explicit opt-in, not credential