From 9f2e36415766024e17655cac2ab18350af848383 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 14 Oct 2026 00:59:38 -0400 Subject: [PATCH] Verify native SD-card library paths before binding them (#757) --- .../launcher/session/SecondaryLibrary.kt | 33 ++++++++++++++- .../launcher/session/SessionService.kt | 15 ++++--- .../launcher/session/SecondaryLibraryTest.kt | 41 +++++++++++++++++++ 3 files changed, 81 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SecondaryLibrary.kt b/app/src/main/java/com/droiddeck/launcher/session/SecondaryLibrary.kt index 24c15df825..53fc319c26 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SecondaryLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SecondaryLibrary.kt @@ -6,6 +6,7 @@ import java.nio.file.LinkOption.NOFOLLOW_LINKS import java.nio.file.StandardCopyOption.COPY_ATTRIBUTES import java.security.MessageDigest import java.util.Locale +import java.util.UUID object SecondaryLibrary { private val bootstrapTools = linkedMapOf( @@ -16,6 +17,34 @@ object SecondaryLibrary { "3127680" to "FEX-Emu", ) + fun contentPath(library: File): File { + val path = library.absolutePath + if (!path.startsWith("/storage/")) return library + val candidate = File("/mnt/media_rw/" + path.removePrefix("/storage/")) + return verifiedAlias(library, candidate) + } + + internal fun verifiedAlias( + library: File, + candidate: File, + readableAndWritable: (File) -> Boolean = { it.canRead() && it.canWrite() }, + ): File { + if (!candidate.isDirectory || !readableAndWritable(candidate)) return library + var probe: File? = null + return try { + val created = File.createTempFile(".droiddeck-path-", ".probe", candidate) + probe = created + val token = UUID.randomUUID().toString() + created.writeText(token) + val visible = File(library, created.name) + if (visible.readText() == token && visible.delete() && !created.exists()) candidate else library + } catch (_: Exception) { + library + } finally { + probe?.delete() + } + } + fun privateRoot(files: File, library: File): File { val digest = MessageDigest.getInstance("SHA-256").digest(library.canonicalPath.toByteArray()) .joinToString("") { "%02x".format(it.toInt() and 255) } @@ -24,7 +53,7 @@ object SecondaryLibrary { val CARD_GUESTS = listOf("/mnt/droiddeck-sd", "/mnt/bannerlator-sd") - fun binds(files: File, library: File, guests: List = CARD_GUESTS): List { + fun binds(files: File, library: File, guests: List = CARD_GUESTS, content: File = library): List { val private = privateRoot(files, library) val apps = File(library, "steamapps") val tools = LinkedHashMap(bootstrapTools) @@ -52,7 +81,7 @@ object SecondaryLibrary { } } return guests.flatMap { guest -> - listOf("${library.path}:$guest") + overrides.map { (host, relative) -> "${host.path}:$guest/$relative" } + listOf("${content.path}:$guest") + overrides.map { (host, relative) -> "${host.path}:$guest/$relative" } } } 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 e49b69a0c2..1435ae4451 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -687,9 +687,12 @@ class SessionService : Service() { File(LinuxRuntime.rootDir(this), "mnt/droiddeck-sd").mkdirs() File(LinuxRuntime.rootDir(this), "mnt/bannerlator-sd").mkdirs() try { - binds.addAll(SecondaryLibrary.binds(filesDir, File(library.path))) - storageDiagnosticLibrary = File(library.path) - Log.i(TAG, "game storage: ${library.path} -> /mnt/droiddeck-sd (\"${library.label}\"); prefixes and native tools private") + val configured = File(library.path) + val content = SecondaryLibrary.contentPath(configured) + binds.addAll(SecondaryLibrary.binds(filesDir, configured, content = content)) + storageDiagnosticLibrary = content + val route = if (content === configured) "configured" else "verified-native" + Log.i(TAG, "game storage: ${content.path} ($route) -> /mnt/droiddeck-sd (\"${library.label}\"); prefixes and native tools private") } catch (e: Exception) { Log.w(TAG, "game storage: private directories could not be prepared; internal only this session", e) } @@ -704,9 +707,9 @@ class SessionService : Service() { val device = StorageDiagnostics.writeSnapshot( sessionDir, target, selectedLibrary = if (storageDiagnosticLibrary != null) "secondary" else "internal", - removable = storageDiagnosticLibrary?.let { - runCatching { Environment.isExternalStorageRemovable(it) }.getOrDefault(false) - } ?: false, + removable = storageDiagnosticLibrary != null && library?.let { + runCatching { Environment.isExternalStorageRemovable(File(it.path)) }.getOrDefault(false) + } == true, ) if (device != null) { val envAt = guest.indexOf(LinuxRuntime.SESSION_SCRIPT).takeIf { it >= 0 } ?: guest.size diff --git a/app/src/test/java/com/droiddeck/launcher/session/SecondaryLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SecondaryLibraryTest.kt index 131ad64e53..a58e075380 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SecondaryLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SecondaryLibraryTest.kt @@ -10,6 +10,47 @@ import org.junit.rules.TemporaryFolder class SecondaryLibraryTest { @get:Rule val tmp = TemporaryFolder() + @Test fun directContentKeepsTheConfiguredLibrarysPrivateDirectories() { + val files = tmp.newFolder("files") + val library = tmp.newFolder("shared") + val content = tmp.newFolder("direct") + val private = SecondaryLibrary.privateRoot(files, library) + val binds = SecondaryLibrary.binds(files, library, listOf("/mnt/droiddeck-sd"), content) + assertEquals("${content.path}:/mnt/droiddeck-sd", binds.first()) + assertTrue(binds.contains("$private/steamapps/compatdata:/mnt/droiddeck-sd/steamapps/compatdata")) + assertFalse(SecondaryLibrary.privateRoot(files, content).exists()) + } + + @Test fun aWritableAliasIsSelectedAndItsProbeIsRemoved() { + val library = tmp.newFolder("shared") + val candidate = File(tmp.root, "direct") + Files.createSymbolicLink(candidate.toPath(), library.toPath()) + assertEquals(candidate, SecondaryLibrary.verifiedAlias(library, candidate)) + assertTrue(library.listFiles()!!.isEmpty()) + } + + @Test fun aDeniedAliasFallsBackBeforeCreatingAProbe() { + val library = tmp.newFolder("shared") + val candidate = tmp.newFolder("denied") + assertEquals(library, SecondaryLibrary.verifiedAlias(library, candidate) { false }) + assertTrue(candidate.listFiles()!!.isEmpty()) + assertTrue(library.listFiles()!!.isEmpty()) + } + + @Test fun anUnrelatedOrMissingDirectoryCannotReplaceTheLibrary() { + val library = tmp.newFolder("shared") + val candidate = tmp.newFolder("other") + assertEquals(library, SecondaryLibrary.verifiedAlias(library, candidate)) + assertTrue(candidate.listFiles()!!.isEmpty()) + assertTrue(library.listFiles()!!.isEmpty()) + assertEquals(library, SecondaryLibrary.verifiedAlias(library, File(tmp.root, "missing"))) + } + + @Test fun aNonStorageLibraryKeepsItsConfiguredPath() { + val library = tmp.newFolder("games") + assertSame(library, SecondaryLibrary.contentPath(library)) + } + @Test fun gamesStaySharedButPrefixesAndNativeDownloadsArePrivate() { val files = tmp.newFolder("files") val library = tmp.newFolder("card")