diff --git a/app/src/main/java/com/droiddeck/launcher/core/Hashes.kt b/app/src/main/java/com/droiddeck/launcher/core/Hashes.kt new file mode 100644 index 0000000000..072874c876 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/Hashes.kt @@ -0,0 +1,36 @@ +package com.droiddeck.launcher.core + +import java.io.File +import java.security.MessageDigest + +/** File checksums as lowercase hex, and GitHub's release-asset digests, in one place. */ +object Hashes { + private val GITHUB_SHA256 = Regex("(?i)sha256:[0-9a-f]{64}") + + @JvmStatic + fun sha256(file: File): String = hex(file, "SHA-256") + + @JvmStatic + fun sha512(file: File): String = hex(file, "SHA-512") + + /** True when [digest] is GitHub's asset digest form, "sha256:" and 64 hex digits. */ + @JvmStatic + fun isGithubSha256(digest: String?): Boolean = digest != null && digest.matches(GITHUB_SHA256) + + /** The hex of a GitHub asset digest ("sha256:"), or null when [digest] is not one. */ + @JvmStatic + fun githubSha256(digest: String?): String? = digest?.takeIf { isGithubSha256(it) }?.substringAfter(':') + + private fun hex(file: File, algorithm: String): String { + val digest = MessageDigest.getInstance(algorithm) + file.inputStream().buffered(1 shl 16).use { input -> + val buffer = ByteArray(1 shl 20) + while (true) { + val n = input.read(buffer) + if (n < 0) break + digest.update(buffer, 0, n) + } + } + return digest.digest().joinToString("") { "%02x".format(it.toInt() and 0xff) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipReleases.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipReleases.kt index c90c60883c..14e7e81e6f 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipReleases.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipReleases.kt @@ -1,8 +1,8 @@ package com.droiddeck.launcher.gpu +import com.droiddeck.launcher.core.Hashes import android.content.Context import com.droiddeck.launcher.core.FileUtils -import com.droiddeck.launcher.runtime.LinuxRuntimeInstaller import org.json.JSONArray import org.json.JSONObject import java.io.File @@ -93,7 +93,7 @@ object TurnipReleases { val name = a.getString("name") val (linux, label) = src.classify(name, tag) ?: continue // Only assets GitHub has a sha256 for are offered: the download is checked against it. - val sha = sha256Of(a) ?: continue + val sha = Hashes.githubSha256(a.optString("digest")) ?: continue // Newest first: the first release carrying a variant is the one offered. if (!seen.add("$linux|$label")) continue assets.put(JSONObject().put("source", src.label).put("tag", tag).put("name", name) @@ -114,12 +114,6 @@ object TurnipReleases { return parse(stored) } - /** The asset's sha256 from GitHub's "digest" field ("sha256:"), or null when it has none. */ - private fun sha256Of(asset: JSONObject): String? = - asset.optString("digest").takeIf { it.matches(SHA256_DIGEST) }?.substringAfter(':') - - private val SHA256_DIGEST = Regex("(?i)sha256:[0-9a-f]{64}") - private fun get(url: String): String { val c = URL(url).openConnection() as HttpURLConnection c.connectTimeout = 15_000 @@ -203,7 +197,7 @@ object TurnipReleases { } } } - if (!asset.sha256.equals(LinuxRuntimeInstaller.sha256(target), ignoreCase = true)) { + if (!asset.sha256.equals(Hashes.sha256(target), ignoreCase = true)) { throw IOException("Checksum mismatch - the download was discarded") } return target diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt index cef72df493..601527623e 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt @@ -1,12 +1,11 @@ package com.droiddeck.launcher.runtime +import com.droiddeck.launcher.core.Hashes import android.content.Context import android.util.Log import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.session.SessionState import java.io.File -import java.io.FileInputStream -import java.security.MessageDigest import org.json.JSONArray /** Optional Decky Loader installation for the ARM64 Linux guest. */ @@ -84,7 +83,7 @@ object DeckyManager { val n = it.optString("name") (n == "$name.sha256" || n == "$name.sha256sum" || n == "$name.sha256.txt") && it.optString("browser_download_url").startsWith("https://") }?.optString("browser_download_url")?.takeIf { it.startsWith("https://") } - val digest = binary.optString("digest").takeIf { it.matches(Regex("(?i)sha256:[0-9a-f]{64}")) } + val digest = binary.optString("digest").takeIf { Hashes.isGithubSha256(it) } if (digest == null && checksum == null) continue val size = binary.optLong("size", 0) if (size <= 0) continue @@ -109,7 +108,7 @@ object DeckyManager { Regex("(?i)\\b[0-9a-f]{64}\\b").find(checksumBody)?.value } ?: run { temp.delete(); return "Release checksum is missing" } if (!expected.matches(Regex("(?i)[0-9a-f]{64}"))) { temp.delete(); return "Release checksum is invalid" } - if (!expected.equals(sha256(temp), true)) { temp.delete(); return "Decky Loader checksum mismatch" } + if (!expected.equals(Hashes.sha256(temp), true)) { temp.delete(); return "Decky Loader checksum mismatch" } if (!validElf(temp, release.machine)) { temp.delete(); return "Release asset is not a compatible 64-bit Linux executable" } if (SessionState.running) { temp.delete(); return "A session started during the download; stop it before installing Decky Loader" } if (!temp.setExecutable(true, false)) { temp.delete(); return "Could not mark PluginLoader executable" } @@ -148,15 +147,6 @@ object DeckyManager { if (wipeData) File(root, "root/homebrew").deleteRecursively() } - private fun sha256(file: File): String { - val digest = MessageDigest.getInstance("SHA-256") - FileInputStream(file).buffered().use { input -> - val buffer = ByteArray(1024 * 1024) - while (true) { val n = input.read(buffer); if (n < 0) break; digest.update(buffer, 0, n) } - } - return digest.digest().joinToString("") { "%02x".format(it.toInt() and 255) } - } - private fun validElf(file: File, machine: Int): Boolean = runCatching { file.inputStream().use { input -> val h = ByteArray(20) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index c57ca0685d..da69edf43f 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.runtime +import com.droiddeck.launcher.core.Hashes import android.content.Context import android.util.Log import com.droiddeck.launcher.core.Downloader @@ -91,7 +92,7 @@ object DesktopCatalog { } if (!ok) return "Download failed" listener?.onProgress("Verifying", -1) - val actual = LinuxRuntimeInstaller.sha256(download) + val actual = Hashes.sha256(download) if (!entry.sha256.equals(actual, ignoreCase = true)) return "Checksum mismatch - nothing was changed" listener?.onProgress("Installing ${entry.name}", -1) when (entry.kind) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index 189666857c..66f8f918af 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -6,6 +6,7 @@ import android.util.Log; import com.droiddeck.launcher.core.ArchivePaths; import com.droiddeck.launcher.core.Downloader; +import com.droiddeck.launcher.core.Hashes; import com.droiddeck.launcher.core.FileUtils; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; @@ -24,7 +25,6 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.StandardCopyOption; -import java.security.MessageDigest; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; @@ -200,7 +200,7 @@ public final class LinuxRuntimeInstaller { } if (listener != null) listener.onProgress("Verifying", -1); - String actual = sha256(archive); + String actual = Hashes.sha256(archive); if (!release.sha256.equalsIgnoreCase(actual)) { Log.w(TAG, "checksum mismatch: wanted " + release.sha256 + ", got " + actual); return false; @@ -340,16 +340,4 @@ public final class LinuxRuntimeInstaller { return false; } } - - public static String sha256(File file) throws Exception { - MessageDigest digest = MessageDigest.getInstance("SHA-256"); - try (InputStream in = new BufferedInputStream(new FileInputStream(file), 1 << 16)) { - byte[] buffer = new byte[1 << 16]; - int read; - while ((read = in.read(buffer)) != -1) digest.update(buffer, 0, read); - } - StringBuilder sb = new StringBuilder(); - for (byte b : digest.digest()) sb.append(String.format("%02x", b)); - return sb.toString(); - } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index 141aae297f..da00b1b392 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.session +import com.droiddeck.launcher.core.Hashes import android.content.Context import android.util.Log import com.droiddeck.launcher.core.Downloader @@ -16,7 +17,6 @@ import java.io.BufferedOutputStream import java.io.File import java.io.FileInputStream import java.io.FileOutputStream -import java.security.MessageDigest /** * FEX, DXVK and VKD3D-Proton per Proton, for the Linux Steam client. @@ -245,17 +245,8 @@ object ComponentsManager { private fun owned(comp: String, rel: String) = comp == "fex" || PE_ARCHES.any { "/$it/" in rel } - private fun sha256(f: File): String { - val md = MessageDigest.getInstance("SHA-256") - FileInputStream(f).use { input -> - val buf = ByteArray(1 shl 16) - while (true) { val n = input.read(buf); if (n < 0) break; md.update(buf, 0, n) } - } - return md.digest().joinToString("") { "%02x".format(it.toInt() and 255) } - } - private fun fingerprint(dir: File, comp: String): Map = - compFiles(dir, comp).filter { owned(comp, it) }.associateWith { sha256(File(dir, it)) } + compFiles(dir, comp).filter { owned(comp, it) }.associateWith { Hashes.sha256(File(dir, it)) } // ------------------------------------------------------------------ packages @@ -316,7 +307,7 @@ object ComponentsManager { if (rel.endsWith(".so")) tmp.setExecutable(true, false) tmp.setReadable(true, false) if (!tmp.renameTo(dst)) { dst.delete(); check(tmp.renameTo(dst)) { "could not place $rel" } } - hashes[rel] = sha256(dst) + hashes[rel] = Hashes.sha256(dst) } return hashes } finally { @@ -630,7 +621,7 @@ object ComponentsManager { val name = a.optString("name") if (!name.endsWith(".wcp")) continue // Only packages GitHub has a sha256 for are offered: the download is checked against it. - if (!a.optString("digest").matches(Regex("(?i)sha256:[0-9a-f]{64}"))) continue + if (!Hashes.isGithubSha256(a.optString("digest"))) continue items.put(JSONObject().put("file", name).put("comp", comp).put("release", tag) .put("url", a.optString("browser_download_url")).put("size", a.optLong("size")).put("digest", a.optString("digest"))) } @@ -652,12 +643,12 @@ object ComponentsManager { /** Downloads a catalog item into storage, verifying the release's sha256 and the package type. */ fun download(context: Context, item: CatalogItem, progress: (Int) -> Unit): Package { require(item.url.startsWith("https://github.com/$NIGHTLIES/releases/download/")) { "Downloads come only from the Nightlies releases" } - require(item.digest.matches(Regex("(?i)sha256:[0-9a-f]{64}"))) { "This package list predates checksums - refresh it and try again" } + require(Hashes.isGithubSha256(item.digest)) { "This package list predates checksums - refresh it and try again" } val dest = File(packagesDir(context), safeName(item.file)) val part = File(dest.parentFile, dest.name + ".part") part.delete() check(Downloader.downloadFile(item.url, part, false) { f -> progress(if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) }) { "Download failed" } - if (!sha256(part).equals(item.digest.substringAfter(':'), true)) { part.delete(); error("Checksum mismatch") } + if (!Hashes.sha256(part).equals(item.digest.substringAfter(':'), true)) { part.delete(); error("Checksum mismatch") } val info = runCatching { packageInfo(part) }.getOrElse { part.delete(); throw it } synchronized(lock) { part.renameTo(dest) } return info.copy(file = dest.name) diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index 19c9aae860..2a94134b82 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.session +import com.droiddeck.launcher.core.Hashes import android.content.Context import android.os.StatFs import android.util.Log @@ -7,7 +8,6 @@ import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File -import java.security.MessageDigest import org.json.JSONArray /** Immediate download and installation of the optional ARM64 Proton builds. */ @@ -105,11 +105,11 @@ object ProtonExtras { // release's own sha512 file. A download neither vouches for is not installed. onProgress("Verifying download", -1) val verified = when { - asset.sha256 != null -> asset.sha256.equals(com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.sha256(archive), ignoreCase = true) + asset.sha256 != null -> asset.sha256.equals(Hashes.sha256(archive), ignoreCase = true) asset.sha512 != null -> { val expected = Downloader.downloadString(asset.sha512)?.let { Regex("(?i)\\b[0-9a-f]{128}\\b").find(it)?.value } ?: return "Could not read the release checksum; try again" - expected.equals(sha512(archive), ignoreCase = true) + expected.equals(Hashes.sha512(archive), ignoreCase = true) } else -> { archive.delete() @@ -182,7 +182,7 @@ object ProtonExtras { release.optString("tag_name"), name, archive.optString("browser_download_url").takeIf { it.startsWith("http") } ?: continue, checksum, archive.optLong("size", 0L), - archive.optString("digest").takeIf { it.matches(Regex("(?i)sha256:[0-9a-f]{64}")) }?.substringAfter(':'), + Hashes.githubSha256(archive.optString("digest")), ) } null @@ -192,19 +192,6 @@ object ProtonExtras { } } - private fun sha512(file: File): String { - val digest = MessageDigest.getInstance("SHA-512") - file.inputStream().buffered().use { input -> - val buffer = ByteArray(4 * 1024 * 1024) - while (true) { - val read = input.read(buffer) - if (read < 0) break - digest.update(buffer, 0, read) - } - } - return digest.digest().joinToString("") { "%02x".format(it.toInt() and 0xff) } - } - private fun requestLines(context: Context): List = FileUtils.readString(requests(context))?.lines()?.filter { it.isNotBlank() } ?: emptyList() } diff --git a/app/src/test/java/com/droiddeck/launcher/core/HashesTest.kt b/app/src/test/java/com/droiddeck/launcher/core/HashesTest.kt new file mode 100644 index 0000000000..dda2151fea --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/HashesTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.core + +import java.io.File +import java.nio.file.Files +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class HashesTest { + private fun file(text: String): File = + Files.createTempFile("hashes", ".bin").toFile().apply { writeText(text); deleteOnExit() } + + @Test fun sha256OfKnownInput() { + assertEquals("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", Hashes.sha256(file("abc"))) + } + + @Test fun sha512OfKnownInput() { + assertEquals( + "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a" + + "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f", + Hashes.sha512(file("abc")), + ) + } + + @Test fun githubDigestIsRecognised() { + val hex = "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" + assertTrue(Hashes.isGithubSha256("sha256:$hex")) + assertEquals(hex, Hashes.githubSha256("sha256:$hex")) + assertEquals(hex.uppercase(), Hashes.githubSha256("SHA256:${hex.uppercase()}")) + } + + @Test fun anythingElseIsNotADigest() { + assertFalse(Hashes.isGithubSha256(null)) + assertFalse(Hashes.isGithubSha256("")) + assertFalse(Hashes.isGithubSha256("sha256:abc")) + assertFalse(Hashes.isGithubSha256("sha512:" + "0".repeat(64))) + assertNull(Hashes.githubSha256("md5:0123")) + } +}