From aa0c12a5396812ec33b8b07baa2e74d2ea0c1e51 Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Wed, 18 Nov 2026 16:35:48 +0100 Subject: [PATCH 1/8] Upload logs test scenario Signed-off-by: daniele-verducci --- .../android/ui/helpers/UriUploaderIT.kt | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) 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..338e0b5e043d 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,30 @@ class UriUploaderIT : AbstractIT() { } } - private fun testPrivatePath(activity: TestActivity, path: String) { + @Test + fun testUploadPrivatePathLogFile() { + launchActivity().use { scenario -> + scenario.onActivity { activity -> + val packageName = activity.packageName + val path = "content://$packageName/attachments/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 +71,6 @@ class UriUploaderIT : AbstractIT() { false, null ) - val uploadResult = sut.uploadUris() - Assert.assertEquals( - "Wrong result code", - UriUploader.UriUploaderResultCode.ERROR_SENSITIVE_PATH, - uploadResult - ) + return sut.uploadUris() } } From 00b7f2dcf974fe2d61fbd402f901576b0b9c6f2b Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Wed, 18 Nov 2026 17:30:55 +0100 Subject: [PATCH 2/8] Added some other UriUploader tests Signed-off-by: daniele-verducci --- .../android/ui/helpers/UriUploaderIT.kt | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) 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 338e0b5e043d..128b3a610c8d 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 @@ -39,7 +39,19 @@ class UriUploaderIT : AbstractIT() { } @Test - fun testUploadPrivatePathLogFile() { + fun testUploadPrivatePathDbFile() { + launchActivity().use { scenario -> + scenario.onActivity { activity -> + val packageName = activity.packageName + val path = "/data/data/$packageName/databases/filelist" + testPrivatePath(activity, path) + } + } + } + + + @Test + fun testUploadPublicPathLogFile() { launchActivity().use { scenario -> scenario.onActivity { activity -> val packageName = activity.packageName @@ -49,6 +61,29 @@ class UriUploaderIT : AbstractIT() { } } + + @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) + } + } + } + private fun testPrivatePath(activity: TestActivity, path: String) = Assert.assertEquals( "Wrong result code", UriUploader.UriUploaderResultCode.ERROR_SENSITIVE_PATH, From d9fca39297c8c636aac7019c12d5b611b133b968 Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Wed, 18 Nov 2026 17:39:57 +0100 Subject: [PATCH 3/8] Fix uri Signed-off-by: daniele-verducci --- .../java/com/owncloud/android/ui/helpers/UriUploaderIT.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 128b3a610c8d..327fc08abada 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 @@ -43,7 +43,7 @@ class UriUploaderIT : AbstractIT() { launchActivity().use { scenario -> scenario.onActivity { activity -> val packageName = activity.packageName - val path = "/data/data/$packageName/databases/filelist" + val path = "file:///data/data/$packageName/databases/filelist" testPrivatePath(activity, path) } } From 701ebcd9c0f299dc9d6800bcc22010753eea4af4 Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Wed, 18 Nov 2026 18:21:30 +0100 Subject: [PATCH 4/8] Compare paths against app paths Signed-off-by: daniele-verducci --- .../android/ui/helpers/UriUploader.kt | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) 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..e53e2c4ead63 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,23 @@ 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 sensitiveFolders = arrayListOf() + sensitiveFolders.add( + 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 { + path.startsWith(it.path) + } + } /** * Requests the upload of a file in the local file system to [FileUploadHelper] service. From b5f58973ca7fe6018f7daa505b21315043afb78d Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Wed, 18 Nov 2026 18:25:09 +0100 Subject: [PATCH 5/8] Fix: resolve symlinks Signed-off-by: daniele-verducci --- .../main/java/com/owncloud/android/ui/helpers/UriUploader.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e53e2c4ead63..58057441a7b0 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 @@ -131,6 +131,7 @@ class UriUploader @JvmOverloads constructor( private fun isSensitiveUri(uri: Uri): Boolean { val path = uri.path ?: return true + val canonicalPath = File(path).canonicalPath val sensitiveFolders = arrayListOf() sensitiveFolders.add( @@ -143,7 +144,7 @@ class UriUploader @JvmOverloads constructor( return sensitiveFolders .filterNotNull() .any { - path.startsWith(it.path) + canonicalPath.startsWith(it.canonicalPath) } } From d9527602b3e22bb8634beee6f2fe3bc00d74e35d Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Wed, 18 Nov 2026 18:48:49 +0100 Subject: [PATCH 6/8] Added missing data dir Signed-off-by: daniele-verducci --- .../java/com/owncloud/android/ui/helpers/UriUploader.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 58057441a7b0..0d1518efbf8c 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 @@ -133,9 +133,9 @@ class UriUploader @JvmOverloads constructor( val path = uri.path ?: return true val canonicalPath = File(path).canonicalPath - val sensitiveFolders = arrayListOf() - sensitiveFolders.add( - MainApp.getStoragePath()?.let { File(it, MainApp.dataFolder) } + val sensitiveFolders = arrayListOf( + activity.dataDir, + MainApp.getStoragePath()?.let { File(it, MainApp.dataFolder) }, ) sensitiveFolders.addAll(activity.getExternalFilesDirs(null)) sensitiveFolders.addAll(activity.externalCacheDirs.filterNotNull()) From 17dbee8d8ff391a0d438c58da5308e96e98f5661 Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Fri, 20 Nov 2026 17:55:06 +0100 Subject: [PATCH 7/8] Catched edge case: folder with name starting with package name was denied Signed-off-by: daniele-verducci --- .../com/owncloud/android/ui/helpers/UriUploaderIT.kt | 11 +++++++++++ .../com/owncloud/android/ui/helpers/UriUploader.kt | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) 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 327fc08abada..e13d5bddceda 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 @@ -84,6 +84,17 @@ class UriUploaderIT : AbstractIT() { } } + @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, 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 0d1518efbf8c..314867509a16 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 @@ -131,7 +131,7 @@ class UriUploader @JvmOverloads constructor( private fun isSensitiveUri(uri: Uri): Boolean { val path = uri.path ?: return true - val canonicalPath = File(path).canonicalPath + val canonicalPath = File(path).canonicalFile.toPath() val sensitiveFolders = arrayListOf( activity.dataDir, @@ -144,7 +144,7 @@ class UriUploader @JvmOverloads constructor( return sensitiveFolders .filterNotNull() .any { - canonicalPath.startsWith(it.canonicalPath) + canonicalPath.startsWith(it.canonicalFile.toPath()) } } From 4f5e10459d2ede6f4ca61a25c86c6117563b3e92 Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Fri, 20 Nov 2026 17:56:05 +0100 Subject: [PATCH 8/8] Spotless Signed-off-by: daniele-verducci --- .../android/ui/helpers/UriUploaderIT.kt | 18 ++++++++---------- .../owncloud/android/ui/helpers/UriUploader.kt | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) 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 e13d5bddceda..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 @@ -49,7 +49,6 @@ class UriUploaderIT : AbstractIT() { } } - @Test fun testUploadPublicPathLogFile() { launchActivity().use { scenario -> @@ -61,7 +60,6 @@ class UriUploaderIT : AbstractIT() { } } - @Test fun testUploadPublicPathFileNamedAsPackageName() { launchActivity().use { scenario -> @@ -96,16 +94,16 @@ class UriUploaderIT : AbstractIT() { } private fun testPrivatePath(activity: TestActivity, path: String) = Assert.assertEquals( - "Wrong result code", - UriUploader.UriUploaderResultCode.ERROR_SENSITIVE_PATH, - testPath(activity, path) - ) + "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) - ) + "Wrong result code", + UriUploader.UriUploaderResultCode.ERROR_SENSITIVE_PATH, + testPath(activity, path) + ) private fun testPath(activity: TestActivity, path: String): UriUploader.UriUploaderResultCode { val sut = UriUploader( 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 314867509a16..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 @@ -135,7 +135,7 @@ class UriUploader @JvmOverloads constructor( val sensitiveFolders = arrayListOf( activity.dataDir, - MainApp.getStoragePath()?.let { File(it, MainApp.dataFolder) }, + MainApp.getStoragePath()?.let { File(it, MainApp.dataFolder) } ) sensitiveFolders.addAll(activity.getExternalFilesDirs(null)) sensitiveFolders.addAll(activity.externalCacheDirs.filterNotNull())