NFC-137 Filter external file URIs by content/file scheme

Author: aarmam

utils-lib/src/main/kotlin/ee/ria/DigiDoc/utilsLib/file/FileUtil.kt

@@ -62,6 +62,7 @@ import javax.xml.parsers.SAXParserFactory
 
 object FileUtil {
     private val LOG_TAG = javaClass.simpleName
+    private val ALLOWED_FILE_SCHEMES = setOf("content", "file")
 
     /**
      * Check if file path is in cache directory
@@ -471,10 +472,10 @@ object FileUtil {
 
     fun getExternalFileUris(intent: Intent): List<Uri> {
         val externalFileUris = mutableListOf<Uri>()
-        intent.data?.let { externalFileUris.add(it) }
+        intent.data?.takeIf { it.scheme in ALLOWED_FILE_SCHEMES }?.let { externalFileUris.add(it) }
         intent.clipData?.let { clipData ->
             for (i in 0 until clipData.itemCount) {
-                clipData.getItemAt(i)?.uri?.let { externalFileUris.add(it) }
+                clipData.getItemAt(i)?.uri?.takeIf { it.scheme in ALLOWED_FILE_SCHEMES }?.let { externalFileUris.add(it) }
             }
         }
         return externalFileUris

utils-lib/src/test/kotlin/ee/ria/DigiDoc/utilsLib/file/FileUtilTest.kt

@@ -78,17 +78,61 @@ class FileUtilTest {
         }
 
     @Test
-    fun fileUtil_getExternalFileUris_successWithSingleUriIntentData() =
+    fun fileUtil_getExternalFileUris_successWithContentSchemeUri() =
         runBlocking {
             val mockIntent = mock(Intent::class.java)
             val mockUri = mock(Uri::class.java)
 
+            `when`(mockUri.scheme).thenReturn("content")
             `when`(mockIntent.data).thenReturn(mockUri)
 
             val externalFileUris = FileUtil.getExternalFileUris(mockIntent)
 
             assertEquals(1, externalFileUris.size)
-            assertEquals(externalFileUris.first(), mockIntent.data)
+            assertEquals(mockUri, externalFileUris.first())
+        }
+
+    @Test
+    fun fileUtil_getExternalFileUris_successWithFileSchemeUri() =
+        runBlocking {
+            val mockIntent = mock(Intent::class.java)
+            val mockUri = mock(Uri::class.java)
+
+            `when`(mockUri.scheme).thenReturn("file")
+            `when`(mockIntent.data).thenReturn(mockUri)
+
+            val externalFileUris = FileUtil.getExternalFileUris(mockIntent)
+
+            assertEquals(1, externalFileUris.size)
+            assertEquals(mockUri, externalFileUris.first())
+        }
+
+    @Test
+    fun fileUtil_getExternalFileUris_excludesHttpsSchemeUri() =
+        runBlocking {
+            val mockIntent = mock(Intent::class.java)
+            val mockUri = mock(Uri::class.java)
+
+            `when`(mockUri.scheme).thenReturn("https")
+            `when`(mockIntent.data).thenReturn(mockUri)
+
+            val externalFileUris = FileUtil.getExternalFileUris(mockIntent)
+
+            assertEquals(0, externalFileUris.size)
+        }
+
+    @Test
+    fun fileUtil_getExternalFileUris_excludesCustomSchemeUri() =
+        runBlocking {
+            val mockIntent = mock(Intent::class.java)
+            val mockUri = mock(Uri::class.java)
+
+            `when`(mockUri.scheme).thenReturn("web-eid-mobile")
+            `when`(mockIntent.data).thenReturn(mockUri)
+
+            val externalFileUris = FileUtil.getExternalFileUris(mockIntent)
+
+            assertEquals(0, externalFileUris.size)
         }
 
     @Test
@@ -112,6 +156,8 @@ class FileUtilTest {
             val mockUri1 = mock(Uri::class.java)
             val mockUri2 = mock(Uri::class.java)
 
+            `when`(mockUri1.scheme).thenReturn("content")
+            `when`(mockUri2.scheme).thenReturn("file")
             `when`(mockClipDataItem1.uri).thenReturn(mockUri1)
             `when`(mockClipDataItem2.uri).thenReturn(mockUri2)
 
@@ -128,6 +174,33 @@ class FileUtilTest {
             assertEquals(mockUri2, externalFileUris.last())
         }
 
+    @Test
+    fun fileUtil_getExternalFileUris_clipDataFiltersOutNonAllowedSchemes() =
+        runBlocking {
+            val mockIntent = mock(Intent::class.java)
+            val mockClipData = mock(ClipData::class.java)
+            val mockClipDataItem1 = mock(ClipData.Item::class.java)
+            val mockClipDataItem2 = mock(ClipData.Item::class.java)
+            val mockUri1 = mock(Uri::class.java)
+            val mockUri2 = mock(Uri::class.java)
+
+            `when`(mockUri1.scheme).thenReturn("content")
+            `when`(mockUri2.scheme).thenReturn("https")
+            `when`(mockClipDataItem1.uri).thenReturn(mockUri1)
+            `when`(mockClipDataItem2.uri).thenReturn(mockUri2)
+
+            `when`(mockClipData.getItemAt(0)).thenReturn(mockClipDataItem1)
+            `when`(mockClipData.getItemAt(1)).thenReturn(mockClipDataItem2)
+            `when`(mockClipData.itemCount).thenReturn(2)
+
+            `when`(mockIntent.clipData).thenReturn(mockClipData)
+
+            val externalFileUris = FileUtil.getExternalFileUris(mockIntent)
+
+            assertEquals(1, externalFileUris.size)
+            assertEquals(mockUri1, externalFileUris.first())
+        }
+
     @Test
     fun fileUtil_getExternalFileUris_returnEmptyListWithoutIntentClipData() =
         runBlocking {