From 1e23bb6d8df97dac5b065ab9b63345ec45f29512 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 16:51:29 -0400 Subject: [PATCH] fix(stores): handle Android storage aliases --- .../launcher/stores/amazon/AmazonEngine.kt | 3 ++- .../launcher/stores/amazon/AmazonEngineTest.kt | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/amazon/AmazonEngine.kt b/app/src/main/java/com/droiddeck/launcher/stores/amazon/AmazonEngine.kt index 1eb41ba8e3..95aa406c58 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/amazon/AmazonEngine.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/amazon/AmazonEngine.kt @@ -8,7 +8,8 @@ internal object AmazonEngine { fun verify(directory: File): Boolean = runCatching { val manifest = File(directory, "engine.json") val library = File(directory, "libdroiddeckamazon.so") - check(manifest.canonicalFile == manifest.absoluteFile && library.canonicalFile == library.absoluteFile) + val root = directory.canonicalFile + check(manifest.canonicalFile == File(root, manifest.name) && library.canonicalFile == File(root, library.name)) check(manifest.length() in 1..131_072 && library.isFile) val data = JSONObject(manifest.readText()) check(data.getInt("schema") == 1 && data.getInt("abi") == 1) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/amazon/AmazonEngineTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/amazon/AmazonEngineTest.kt index 65e3806f11..e42993b849 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/amazon/AmazonEngineTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/amazon/AmazonEngineTest.kt @@ -2,10 +2,12 @@ package com.droiddeck.launcher.stores.amazon import java.io.File import java.security.MessageDigest +import java.nio.file.Files import org.json.JSONObject import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Rule +import org.junit.Assume.assumeFalse import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith @@ -51,4 +53,17 @@ class AmazonEngineTest { File(malformed, "engine.json").writeText("not json") assertFalse(AmazonEngine.verify(malformed)) } + + @Test fun parentStorageAliasIsAllowedButLibrarySymlinkIsRejected() { + assumeFalse(System.getProperty("os.name").startsWith("Windows")) + val directory = prepared() + val alias = File(temp.root, "alias") + Files.createSymbolicLink(alias.toPath(), directory.toPath()) + assertTrue(AmazonEngine.verify(alias)) + val library = File(directory, "libdroiddeckamazon.so") + val outside = temp.newFile("outside.so").apply { writeBytes(library.readBytes()) } + library.delete() + Files.createSymbolicLink(library.toPath(), outside.toPath()) + assertFalse(AmazonEngine.verify(directory)) + } }