fix password protect downloads and copying ComicInfo files in LocalSource (#1084)

* fix password protect downloads * fixed copying of ComicInfo file in LocalSource.kt * Return correct archive file * Applied upstream fix * Use tempFileManager instead of file path * Use streams instead of files
2024-03-02 17:56:57 +01:00
parent dd412e33ad
commit eed8ffb9d4
5 changed files with 170 additions and 105 deletions
@@ -3,7 +3,9 @@ package eu.kanade.tachiyomi.util.storage
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import android.util.Base64
+import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.core.security.SecurityPreferences
+import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -11,9 +13,14 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import logcat.LogPriority
 import net.lingala.zip4j.ZipFile
+import net.lingala.zip4j.exception.ZipException
+import net.lingala.zip4j.io.inputstream.ZipInputStream
+import net.lingala.zip4j.io.outputstream.ZipOutputStream
+import net.lingala.zip4j.model.LocalFileHeader
 import net.lingala.zip4j.model.ZipParameters
 import net.lingala.zip4j.model.enums.AesKeyStrength
 import net.lingala.zip4j.model.enums.EncryptionMethod
+import tachiyomi.core.common.util.system.ImageUtil
 import tachiyomi.core.common.util.system.logcat
 import uy.kohesive.injekt.injectLazy
 import java.io.ByteArrayInputStream
@@ -221,6 +228,133 @@ object CbzCrypto {
        }
        return String(bytes).contains(DEFAULT_COVER_NAME, ignoreCase = true)
    }
+
+    fun UniFile.isEncryptedZip(): Boolean {
+        return try {
+            val stream = ZipInputStream(this.openInputStream())
+            stream.nextEntry
+            stream.close()
+            false
+        } catch (zipException: ZipException) {
+            if (zipException.type == ZipException.Type.WRONG_PASSWORD) {
+                true
+            } else throw zipException
+        }
+    }
+
+    fun UniFile.testCbzPassword(): Boolean {
+        return try {
+            val stream = ZipInputStream(this.openInputStream())
+            stream.setPassword(getDecryptedPasswordCbz())
+            stream.nextEntry
+            stream.close()
+            true
+        } catch (zipException: ZipException) {
+            if (zipException.type == ZipException.Type.WRONG_PASSWORD) {
+                false
+            } else throw zipException
+        }
+    }
+
+    fun UniFile.addStreamToZip(inputStream: InputStream, filename: String, password: CharArray? = null) {
+        val zipOutputStream =
+            if (password != null) ZipOutputStream(this.openOutputStream(), password)
+            else ZipOutputStream(this.openOutputStream())
+
+        val zipParameters = ZipParameters()
+        zipParameters.fileNameInZip = filename
+
+        if (password != null) setZipParametersEncrypted(zipParameters)
+        zipOutputStream.putNextEntry(zipParameters)
+
+        zipOutputStream.use { output ->
+            inputStream.use { input ->
+                input.copyTo(output)
+            }
+        }
+    }
+
+
+    fun UniFile.addFilesToZip(files: List<UniFile>, password: CharArray? = null) {
+        val zipOutputStream =
+            if (password != null) ZipOutputStream(this.openOutputStream(), password)
+            else ZipOutputStream(this.openOutputStream())
+
+
+        files.forEach {
+            val zipParameters = ZipParameters()
+            if (password != null) setZipParametersEncrypted(zipParameters)
+            zipParameters.fileNameInZip = it.name
+
+            zipOutputStream.putNextEntry(zipParameters)
+
+            it.openInputStream().use { input ->
+                input.copyTo(zipOutputStream)
+            }
+            zipOutputStream.closeEntry()
+        }
+        zipOutputStream.close()
+    }
+
+    fun UniFile.getZipInputStream(filename: String): InputStream? {
+        val zipInputStream = ZipInputStream(this.openInputStream())
+        var fileHeader: LocalFileHeader?
+
+        if (this.isEncryptedZip()) zipInputStream.setPassword(getDecryptedPasswordCbz())
+
+        try {
+            while (run {
+                    fileHeader = zipInputStream.nextEntry
+                    fileHeader != null
+                }) {
+                if (fileHeader?.fileName == filename) return zipInputStream
+            }
+
+        } catch (zipException: ZipException) {
+            if (zipException.type == ZipException.Type.WRONG_PASSWORD) {
+                logcat(LogPriority.WARN) {
+                    "Wrong CBZ archive password for: ${this.name} in: ${this.parentFile?.name}"
+                }
+            } else throw zipException
+        }
+        return null
+    }
+    fun UniFile.getCoverStreamFromZip(): InputStream? {
+        val zipInputStream = ZipInputStream(this.openInputStream())
+        var fileHeader: LocalFileHeader?
+        val fileHeaderList: MutableList<LocalFileHeader?> = mutableListOf()
+
+        if (this.isEncryptedZip()) zipInputStream.setPassword(getDecryptedPasswordCbz())
+
+        try {
+            while (run {
+                    fileHeader = zipInputStream.nextEntry
+                    fileHeader != null
+                }) {
+                fileHeaderList.add(fileHeader)
+            }
+
+            var coverHeader = fileHeaderList
+                .mapNotNull { it }
+                .sortedWith { f1, f2 -> f1.fileName.compareToCaseInsensitiveNaturalOrder(f2.fileName) }
+                .find { !it.isDirectory && ImageUtil.isImage(it.fileName) }
+
+
+            val coverStream = coverHeader?.fileName?.let { this.getZipInputStream(it) }
+            if (coverStream != null) {
+                if (!ImageUtil.isImage(coverHeader?.fileName) { coverStream }) coverHeader = null
+            }
+            return coverHeader?.fileName?.let { getZipInputStream(it) }
+
+        } catch (zipException: ZipException) {
+            if (zipException.type == ZipException.Type.WRONG_PASSWORD) {
+                logcat(LogPriority.WARN) {
+                    "Wrong CBZ archive password for: ${this.name} in: ${this.parentFile?.name}"
+                }
+                return null
+            } else throw zipException
+        }
+    }
 }

 private const val BUFFER_SIZE = 2048