From 68234d47cd941ae6baf5ce6a4a33518fe431df68 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 10 Nov 2026 15:33:04 -0500 Subject: [PATCH] fix: sandboxes switch on the LSE emulator when it is preloaded --- .../launcher/runtime/BwrapSpawner.kt | 4 +++ .../launcher/runtime/BwrapSpawnerTest.kt | 33 +++++++++++++++++++ 2 files changed, 37 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 2d1a9aa40..f03a9d845 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -252,6 +252,10 @@ 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(":") + if (libs.any { it.endsWith("/liblse_emu.so") }) { + env.putIfAbsent("LSE_EMU", "1") + env.putIfAbsent("LSE_EMU_PATCH", "1") + } 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)) 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 a71063bf3..983bec6a6 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -155,6 +155,39 @@ class BwrapSpawnerPlanTest { } } + @Test fun sandboxesSwitchOnTheLseEmulatorWhenItIsPreloaded() { + val context = RuntimeEnvironment.getApplication() + val rootfs = LinuxRuntime.rootDir(context) + val emu = File(rootfs, "usr/local/lib/droiddeck-lse/liblse_emu.so").apply { parentFile?.mkdirs(); writeText("") } + val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/droiddeck-lse/liblse_emu.so\n") } + try { + val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")), dir) + assertEquals("/run/droiddeck-preload/liblse_emu.so", plan.env["LD_PRELOAD"]) + assertEquals("1", plan.env["LSE_EMU"]) + assertEquals("1", plan.env["LSE_EMU_PATCH"]) + val chosen = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")) + .apply { getJSONObject("env").put("LSE_EMU_PATCH", "0") }, dir) + assertEquals("0", chosen.env["LSE_EMU_PATCH"]) + assertEquals("1", chosen.env["LSE_EMU"]) + } finally { + listOf(emu, preload).forEach { it.delete() } + } + } + + @Test fun sandboxesLeaveTheLseSwitchesAloneWithoutTheEmulator() { + 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") } + try { + val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")), dir) + assertFalse(plan.env.containsKey("LSE_EMU")) + assertFalse(plan.env.containsKey("LSE_EMU_PATCH")) + } finally { + listOf(lib, preload).forEach { it.delete() } + } + } + @Test fun zypakLaunchesTheBrowserWithoutItsSandbox() { val context = RuntimeEnvironment.getApplication() val app = File(runtime, "app").apply { File(this, "bin").mkdirs() }