From 48ad5506b601f73638067424686f924a274d8ff7 Mon Sep 17 00:00:00 2001
From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com>
Date: Wed, 28 Oct 2026 17:50:58 -0400
Subject: [PATCH] fix: forward Steam maintenance navigation
---
.../droiddeck/launcher/FrontEndActivity.kt | 23 +++++++++++++++++--
.../droiddeck/launcher/agent/AgentGuest.kt | 10 ++++++++
.../launcher/session/SteamSessionUrl.kt | 9 ++++++++
app/src/main/res/values/strings.xml | 2 ++
.../launcher/session/SteamSessionUrlTest.kt | 23 +++++++++++++++++++
.../overlay/usr/local/bin/droiddeck-agent | 11 +++++++++
tools/tests/test_droiddeck_agent.py | 16 +++++++++++++
7 files changed, 92 insertions(+), 2 deletions(-)
create mode 100644 app/src/main/java/com/droiddeck/launcher/session/SteamSessionUrl.kt
create mode 100644 app/src/test/java/com/droiddeck/launcher/session/SteamSessionUrlTest.kt
diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
index aff26235af..2547858c91 100644
--- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
@@ -1036,9 +1036,28 @@ class FrontEndActivity : ComponentActivity() {
onPlay = { playSteam() },
onPlaySteamVr = { playSteamVr() },
onSteamUrl = { url ->
- if (!SessionState.running) startSession(
+ if (!com.droiddeck.launcher.session.SteamSessionUrl.isSupported(url)) {
+ android.widget.Toast.makeText(this, R.string.steam_navigation_failed, android.widget.Toast.LENGTH_LONG).show()
+ } else if (!SessionState.running) startSession(
Intent(this, SessionActivity::class.java).putExtra(SessionService.EXTRA_STEAM_URL, url), steamSession = true,
- )
+ ) else if (SessionState.mode != SessionService.MODE_STEAM) {
+ android.widget.Toast.makeText(this, R.string.steam_navigation_switch_mode, android.widget.Toast.LENGTH_LONG).show()
+ } else if (SessionState.stopRequested) {
+ android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show()
+ } else {
+ if (SessionState.suspended) SessionService.resume(this)
+ val context = applicationContext
+ Thread({
+ val opened = runCatching {
+ com.droiddeck.launcher.agent.AgentGuest.openSteamUrl(context, url)
+ }.isSuccess
+ ui.post {
+ if (opened) startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME)
+ .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP))
+ else android.widget.Toast.makeText(this, R.string.steam_navigation_failed, android.widget.Toast.LENGTH_LONG).show()
+ }
+ }, "steam-navigation").start()
+ }
},
onPlayDesktopUi = {
startSession(Intent(this, SessionActivity::class.java)
diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt
index 82572ab19f..46d7994559 100644
--- a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt
+++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt
@@ -12,6 +12,7 @@ import android.util.Log
import com.droiddeck.launcher.runtime.LinuxRuntime
import com.droiddeck.launcher.session.SessionEvents
import com.droiddeck.launcher.session.SessionState
+import com.droiddeck.launcher.session.SteamSessionUrl
import org.json.JSONObject
import java.io.File
import java.util.UUID
@@ -96,6 +97,15 @@ object AgentGuest {
fun focus(context: Context): JSONObject? =
if (SessionState.running) readJson(File(dir(context), "focus.json")) else null
+ fun openSteamUrl(context: Context, url: String): JSONObject {
+ require(SteamSessionUrl.isSupported(url)) { "Unsupported Steam navigation URL" }
+ val result = call(context, JSONObject().put("kind", "steam-url").put("url", url), 8_000, trusted = true)
+ check(SteamSessionUrl.wasOpened(result.optBoolean("ok"), result.optBoolean("launched"))) {
+ "Steam did not accept the navigation request"
+ }
+ return result
+ }
+
fun selectedSteamAppId(context: Context): Long? {
val result = call(context, JSONObject().put("kind", "steam-selection"), 6_000)
if (!result.optBoolean("ok") || result.isNull("appId")) return null
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamSessionUrl.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamSessionUrl.kt
new file mode 100644
index 0000000000..b5ef3f721e
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/session/SteamSessionUrl.kt
@@ -0,0 +1,9 @@
+package com.droiddeck.launcher.session
+
+object SteamSessionUrl {
+ private val allowed = Regex("steam://(?:open/downloads|nav/library|uninstall/[1-9][0-9]{0,9})")
+
+ fun isSupported(url: String): Boolean = allowed.matches(url)
+
+ internal fun wasOpened(ok: Boolean, launched: Boolean): Boolean = ok && launched
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 10b2b913c6..1a8c077a21 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1346,6 +1346,8 @@
This game is no longer in your DroidDeck library.
Stop the current session before launching a Steam game.
Could not send the game to Steam. Try launching it again.
+ Switch to Steam mode to open Steam navigation.
+ Could not open that Steam page. Return to Steam mode and try again.
Retry removal
Removing
Removal incomplete
diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamSessionUrlTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamSessionUrlTest.kt
new file mode 100644
index 0000000000..275964bfed
--- /dev/null
+++ b/app/src/test/java/com/droiddeck/launcher/session/SteamSessionUrlTest.kt
@@ -0,0 +1,23 @@
+package com.droiddeck.launcher.session
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class SteamSessionUrlTest {
+ @Test
+ fun onlySupportedSteamNavigationRoutesAreAccepted() {
+ listOf("steam://open/downloads", "steam://nav/library", "steam://uninstall/12345")
+ .forEach { assertTrue(it, SteamSessionUrl.isSupported(it)) }
+ listOf("steam://open/settings", "steam://uninstall/0", "steam://uninstall/01",
+ "steam://open/downloads\n--exec", "https://example.com")
+ .forEach { assertFalse(it, SteamSessionUrl.isSupported(it)) }
+ }
+
+ @Test
+ fun bridgeMustConfirmLaunch() {
+ assertTrue(SteamSessionUrl.wasOpened(ok = true, launched = true))
+ assertFalse(SteamSessionUrl.wasOpened(ok = false, launched = true))
+ assertFalse(SteamSessionUrl.wasOpened(ok = true, launched = false))
+ }
+}
diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent
index 162d7ebc27..d6e689908a 100755
--- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent
+++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent
@@ -1050,6 +1050,17 @@ def handle(agent_dir, req):
request_timeout(req, 15))
if kind == "steam-selection":
return steam_selection(agent_dir, request_timeout(req, 5))
+ if kind == "steam-url":
+ url = req.get("url")
+ if not isinstance(url, str) or not re.fullmatch(
+ r"steam://(?:open/downloads|nav/library|uninstall/[1-9][0-9]{0,9})", url):
+ raise AgentError("INVALID_REQUEST", "Steam navigation URL is not supported")
+ try:
+ subprocess.Popen(["steam", url], stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
+ stderr=subprocess.DEVNULL, start_new_session=True)
+ except OSError as e:
+ raise AgentError("STEAM_UNAVAILABLE", "%s: %s" % (url, e))
+ return {"launched": True}
if kind == "quit":
return quit_game(agent_dir, req.get("appId"), request_timeout(req, 15))
if kind == "vr":
diff --git a/tools/tests/test_droiddeck_agent.py b/tools/tests/test_droiddeck_agent.py
index e9fae88621..3bdff3159a 100644
--- a/tools/tests/test_droiddeck_agent.py
+++ b/tools/tests/test_droiddeck_agent.py
@@ -196,6 +196,22 @@ class AgentTest(unittest.TestCase):
answer = self.ask({"kind": "vr", "action": "status"})
self.assertEqual("UNAVAILABLE", answer["error"]["code"])
+ def test_steam_url_uses_client_argv_for_supported_navigation(self):
+ with patch.object(agent.subprocess, "Popen") as popen:
+ answer = self.ask({"kind": "steam-url", "url": "steam://open/downloads"})
+ self.assertTrue(answer["ok"])
+ self.assertTrue(answer["launched"])
+ self.assertEqual(["steam", "steam://open/downloads"], popen.call_args.args[0])
+ self.assertTrue(popen.call_args.kwargs["start_new_session"])
+
+ def test_steam_url_rejects_untrusted_routes_and_argument_injection(self):
+ for url in ("steam://open/settings", "steam://open/downloads\n--exec", "https://example.com"):
+ with self.subTest(url=url), patch.object(agent.subprocess, "Popen") as popen:
+ answer = self.ask({"kind": "steam-url", "url": url})
+ self.assertFalse(answer["ok"])
+ self.assertEqual("INVALID_REQUEST", answer["error"]["code"])
+ popen.assert_not_called()
+
def fake_proc(self, pid, parent, comm, env):
root = self.dir / "proc" / str(pid)
root.mkdir(parents=True)