diff --git a/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt index bd776c1d8666..50525311ce1d 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt @@ -38,7 +38,74 @@ class UriUploaderIT : AbstractIT() { } } - private fun testPrivatePath(activity: TestActivity, path: String) { + @Test + fun testUploadPrivatePathDbFile() { + launchActivity().use { scenario -> + scenario.onActivity { activity -> + val packageName = activity.packageName + val path = "file:///data/data/$packageName/databases/filelist" + testPrivatePath(activity, path) + } + } + } + + @Test + fun testUploadPublicPathLogFile() { + launchActivity().use { scenario -> + scenario.onActivity { activity -> + val packageName = activity.packageName + val path = "content://$packageName/attachments/logs.txt" + testPublicPath(activity, path) + } + } + } + + @Test + fun testUploadPublicPathFileNamedAsPackageName() { + launchActivity().use { scenario -> + scenario.onActivity { activity -> + val packageName = activity.packageName + val path = "file:///storage/emulated/0/Download/$packageName.txt" + testPublicPath(activity, path) + } + } + } + + @Test + fun testUploadPublicPathFolderNamedAsPackageName() { + launchActivity().use { scenario -> + scenario.onActivity { activity -> + val packageName = activity.packageName + val path = "file:///storage/emulated/0/Download/$packageName/logs.txt" + testPublicPath(activity, path) + } + } + } + + @Test + fun testUploadPublicPathFolderWhoseNameStartsWithPackageName() { + launchActivity().use { scenario -> + scenario.onActivity { activity -> + val packageName = activity.packageName + val path = "file:///data/data/$packageName.somethingsomething/logs.txt" + testPublicPath(activity, path) + } + } + } + + private fun testPrivatePath(activity: TestActivity, path: String) = Assert.assertEquals( + "Wrong result code", + UriUploader.UriUploaderResultCode.ERROR_SENSITIVE_PATH, + testPath(activity, path) + ) + + private fun testPublicPath(activity: TestActivity, path: String) = Assert.assertNotEquals( + "Wrong result code", + UriUploader.UriUploaderResultCode.ERROR_SENSITIVE_PATH, + testPath(activity, path) + ) + + private fun testPath(activity: TestActivity, path: String): UriUploader.UriUploaderResultCode { val sut = UriUploader( activity, listOf(Uri.parse(path)), @@ -48,11 +115,6 @@ class UriUploaderIT : AbstractIT() { false, null ) - val uploadResult = sut.uploadUris() - Assert.assertEquals( - "Wrong result code", - UriUploader.UriUploaderResultCode.ERROR_SENSITIVE_PATH, - uploadResult - ) + return sut.uploadUris() } } diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt index a93be862a821..9399b921b65b 100644 --- a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt +++ b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt @@ -18,6 +18,7 @@ import androidx.lifecycle.lifecycleScope import com.nextcloud.client.account.User import com.nextcloud.client.jobs.upload.FileUploadHelper import com.nextcloud.model.OCUploadLocalPathData +import com.owncloud.android.MainApp import com.owncloud.android.R import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.ui.activity.FileActivity @@ -25,6 +26,7 @@ import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener import com.owncloud.android.ui.fragment.TaskRetainerFragment import com.owncloud.android.utils.UriUtils.getDisplayNameForUri +import java.io.File /** * This class examines URIs pointing to files to upload and then requests [FileUploadHelper] to upload them. @@ -127,7 +129,24 @@ class UriUploader @JvmOverloads constructor( return uploadPath + displayName } - private fun isSensitiveUri(uri: Uri): Boolean = uri.toString().contains(activity.packageName) + private fun isSensitiveUri(uri: Uri): Boolean { + val path = uri.path ?: return true + val canonicalPath = File(path).canonicalFile.toPath() + + val sensitiveFolders = arrayListOf( + activity.dataDir, + MainApp.getStoragePath()?.let { File(it, MainApp.dataFolder) } + ) + sensitiveFolders.addAll(activity.getExternalFilesDirs(null)) + sensitiveFolders.addAll(activity.externalCacheDirs.filterNotNull()) + sensitiveFolders.addAll(activity.externalMediaDirs.filterNotNull()) + + return sensitiveFolders + .filterNotNull() + .any { + canonicalPath.startsWith(it.canonicalFile.toPath()) + } + } /** * Requests the upload of a file in the local file system to [FileUploadHelper] service.