A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix: reject regular files at the backup directory path
Commiemusclemommieb19f7b657f51
diff --git a/app/src/main/java/com/excp/podroid/data/repository/ContainerBackupRepository.kt b/app/src/main/java/com/excp/podroid/data/repository/ContainerBackupRepository.ktindex 14e6b9d..fa22145 100644--- a/app/src/main/java/com/excp/podroid/data/repository/ContainerBackupRepository.kt+++ b/app/src/main/java/com/excp/podroid/data/repository/ContainerBackupRepository.kt@@ -27,6 +27,13 @@ data class ContainerBackupFile(class ContainerBackupRepository @Inject constructor() {companion object {const val BACKUP_SUBDIR = "Podroid/backups"++ internal fun ensureBackupDirectory(dir: File): Boolean = runCatching {+ if (!dir.isDirectory) dir.mkdirs()+ // Recheck even if mkdirs returned false: another caller may have+ // created the directory. An existing regular file is not usable.+ dir.isDirectory+ }.getOrDefault(false)}fun backupDirectory(): File {@@ -46,7 +53,7 @@ class ContainerBackupRepository @Inject constructor() {// 9p/virtio-9p mount. Nothing else creates this dir, so without it every// backup would fall back to the guest-internal path and never surface in// Downloads.- return runCatching { dir.exists() || dir.mkdirs() }.getOrDefault(false)+ return ensureBackupDirectory(dir)}fun listBackupFiles(): List<ContainerBackupFile> {diff --git a/app/src/test/java/com/excp/podroid/data/repository/ContainerBackupRepositoryTest.kt b/app/src/test/java/com/excp/podroid/data/repository/ContainerBackupRepositoryTest.ktnew file mode 100644index 0000000..eac9efe--- /dev/null+++ b/app/src/test/java/com/excp/podroid/data/repository/ContainerBackupRepositoryTest.kt@@ -0,0 +1,48 @@+package com.excp.podroid.data.repository++import java.io.File+import org.junit.Assert.assertEquals+import org.junit.Assert.assertFalse+import org.junit.Assert.assertTrue+import org.junit.Rule+import org.junit.Test+import org.junit.rules.TemporaryFolder++class ContainerBackupRepositoryTest {+ @get:Rule+ val temporaryFolder = TemporaryFolder()++ @Test+ fun createsMissingBackupDirectoryAndParents() {+ val dir = File(temporaryFolder.root, "Podroid/backups")++ assertTrue(ContainerBackupRepository.ensureBackupDirectory(dir))+ assertTrue(dir.isDirectory)+ }++ @Test+ fun acceptsExistingDirectoryWithoutChangingContents() {+ val dir = temporaryFolder.newFolder("backups")+ val archive = File(dir, "container.tar").apply { writeText("keep") }++ assertTrue(ContainerBackupRepository.ensureBackupDirectory(dir))+ assertEquals("keep", archive.readText())+ }++ @Test+ fun rejectsExistingFileWithoutDeletingIt() {+ val file = temporaryFolder.newFile("backups").apply { writeText("keep") }++ assertFalse(ContainerBackupRepository.ensureBackupDirectory(file))+ assertTrue(file.isFile)+ assertEquals("keep", file.readText())+ }++ @Test+ fun rejectsFileInParentPath() {+ val parent = temporaryFolder.newFile("Podroid").apply { writeText("keep") }++ assertFalse(ContainerBackupRepository.ensureBackupDirectory(File(parent, "backups")))+ assertEquals("keep", parent.readText())+ }+}