VERY experimental Nintendo Switch 2 emulator
C++
android: move unzip function to FileUtil and use SecurityException
PabloG023c15b89b7868
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.ktindex 5f107b37da..36e63bb9e6 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt@@ -23,17 +23,14 @@ import org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.features.DocumentProviderimport org.yuzu.yuzu_emu.getPublicFilesDir-import java.io.BufferedInputStream+import org.yuzu.yuzu_emu.utils.FileUtilimport java.io.BufferedOutputStreamimport java.io.Fileimport java.io.FileOutputStreamimport java.io.FilenameFilter-import java.io.IOException-import java.io.InputStreamimport java.time.LocalDateTimeimport java.time.format.DateTimeFormatterimport java.util.zip.ZipEntry-import java.util.zip.ZipInputStreamimport java.util.zip.ZipOutputStreamclass ImportExportSavesFragment : DialogFragment() {@@ -124,33 +121,6 @@ class ImportExportSavesFragment : DialogFragment() {return true}- /**- * Extracts the save files located in the given zip file and copies them to the saves folder.- * @exception IOException if the file was being created outside of the target directory- */- private fun unzip(zipStream: InputStream, destDir: File): Boolean {- val zis = ZipInputStream(BufferedInputStream(zipStream))- var entry: ZipEntry? = zis.nextEntry- while (entry != null) {- val entryName = entry.name- val entryFile = File(destDir, entryName)- if (!entryFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {- zis.close()- throw IOException("Entry is outside of the target dir: " + entryFile.name)- }- if (entry.isDirectory) {- entryFile.mkdirs()- } else {- entryFile.parentFile?.mkdirs()- entryFile.createNewFile()- entryFile.outputStream().use { fos -> zis.copyTo(fos) }- }- entry = zis.nextEntry- }- zis.close()- return true- }-/*** Exports the save file located in the given folder path by creating a zip file and sharing it via intent.*/@@ -204,7 +174,7 @@ class ImportExportSavesFragment : DialogFragment() {try {CoroutineScope(Dispatchers.IO).launch {- unzip(inputZip, cacheSaveDir)+ FileUtil.unzip(inputZip, cacheSaveDir)cacheSaveDir.list(filterTitleId)?.forEach { savePath ->File(savesFolder, savePath).deleteRecursively()File(cacheSaveDir, savePath).copyRecursively(File(savesFolder, savePath), true)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.ktindex 0a7b323b1c..593dad8d31 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt@@ -9,10 +9,14 @@ import android.net.Uriimport android.provider.DocumentsContractimport androidx.documentfile.provider.DocumentFileimport org.yuzu.yuzu_emu.model.MinimalDocumentFile+import java.io.BufferedInputStream+import java.io.Fileimport java.io.FileOutputStreamimport java.io.IOExceptionimport java.io.InputStreamimport java.net.URLDecoder+import java.util.zip.ZipEntry+import java.util.zip.ZipInputStreamobject FileUtil {const val PATH_TREE = "tree"@@ -276,6 +280,34 @@ object FileUtil {return false}+ /**+ * Extracts the given zip file into the given directory.+ * @exception IOException if the file was being created outside of the target directory+ */+ @Throws(SecurityException::class)+ fun unzip(zipStream: InputStream, destDir: File): Boolean {+ ZipInputStream(BufferedInputStream(zipStream)).use { zis ->+ var entry: ZipEntry? = zis.nextEntry+ while (entry != null) {+ val entryName = entry.name+ val entryFile = File(destDir, entryName)+ if (!entryFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {+ throw SecurityException("Entry is outside of the target dir: " + entryFile.name)+ }+ if (entry.isDirectory) {+ entryFile.mkdirs()+ } else {+ entryFile.parentFile?.mkdirs()+ entryFile.createNewFile()+ entryFile.outputStream().use { fos -> zis.copyTo(fos) }+ }+ entry = zis.nextEntry+ }+ }++ return true+ }+fun isRootTreeUri(uri: Uri): Boolean {val paths = uri.pathSegmentsreturn paths.size == 2 && PATH_TREE == paths[0]