From a7753a667c9dd8062d65aabda7fc345ecce8e066 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sun, 25 Oct 2026 11:28:25 -0400 Subject: [PATCH] fix: Flatpak apps see the device's network, so WebRTC streams connect (#1548) --- .../droiddeck/launcher/runtime/BwrapSpawner.kt | 2 ++ .../launcher/runtime/BwrapSpawnerTest.kt | 15 +++++++++++++++ 2 files changed, 17 insertions(+) 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 4825646786..81fabd7f7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -220,6 +220,7 @@ object BwrapSpawner { val binds = ArrayList() val paths = libs.map { lib -> "$PRELOAD_DIR/${lib.substringAfterLast('/')}".also { binds.add(Bind(rootfs + lib, it)) } } env["LD_PRELOAD"] = (paths + listOfNotNull(env["LD_PRELOAD"]?.takeIf { it.isNotBlank() })).joinToString(":") + File(rootfs, NET_LINK).takeIf { it.isFile }?.let { binds.add(Bind(it.path, "/$NET_LINK")) } env["FAKE_EVDEV_DIR"]?.let { File(it).parent }?.let { dev -> binds.addAll(bindsFor(session, rootfs, dev, dev)) } @@ -227,6 +228,7 @@ object BwrapSpawner { } private const val PRELOAD_DIR = "/run/droiddeck-preload" + private const val NET_LINK = "etc/droiddeck-net" private const val ZYPAK_SHIM = "#!/bin/sh\nprogram=\$1\nshift\nexec \"\$program\" --no-sandbox \"\$@\"\n" diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt index 2cb5e5edd6..dfb3286511 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -119,6 +119,21 @@ class BwrapSpawnerPlanTest { assertEquals("org.example.Game", plan.env["FLATPAK_ID"]) } + @Test fun sandboxedAppsSeeTheSessionsNetworkLink() { + val context = RuntimeEnvironment.getApplication() + val rootfs = LinuxRuntime.rootDir(context) + val lib = File(rootfs, "usr/local/lib/libblsession.so").apply { parentFile?.mkdirs(); writeText("") } + val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libblsession.so\n") } + val link = File(rootfs, "etc/droiddeck-net").apply { writeText("if wlan0 2 1500\n") } + try { + val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")), dir) + assertEquals("/run/droiddeck-preload/libblsession.so", plan.env["LD_PRELOAD"]) + assertEquals(link.path, plan.binds.single { it.guest == "/etc/droiddeck-net" }.host) + } finally { + listOf(lib, preload, link).forEach { it.delete() } + } + } + @Test fun zypakLaunchesTheBrowserWithoutItsSandbox() { val context = RuntimeEnvironment.getApplication() val app = File(runtime, "app").apply { File(this, "bin").mkdirs() }