Fix crash caused by incorrect VNC URIs

If user passed 'vnc:something' instead of 'vnc://something', it would lead to a crash because 'vnc:something' is not a valid VNC URI.
gujjwal00 · May 17, 2023 · 385e7b8 · 385e7b8
1 parent 505abaa
commit 385e7b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/src/androidTest/java/com/gaurav/avnc/vnc/VncUriTest.kt b/app/src/androidTest/java/com/gaurav/avnc/vnc/VncUriTest.kt
@@ -84,4 +84,10 @@ class VncUriTest {
         val uri = VncUri("[fe80:2a10:b62b]")
         assertEquals("", uri.host)
     }
+
+    @Test
+    fun opaqueUri() {
+        // Correct format is 'vnc://host'
+        assertEquals("", VncUri("vnc:host").host)
+    }
 }
diff --git a/app/src/main/java/com/gaurav/avnc/vnc/VncUri.kt b/app/src/main/java/com/gaurav/avnc/vnc/VncUri.kt
@@ -37,7 +37,7 @@ class VncUri(private val uri: Uri) {
      *
      * It also serves as a validation step because [URI] verifies that address is well-formed.
      */
-    private val javaUri = runCatching { URI(uri.toString()) }.getOrDefault(URI(""))
+    private val javaUri = runCatching { URI(uri.toString()).also { check(!it.isOpaque) } }.getOrDefault(URI(""))
 
 
     val host = javaUri.host?.trim('[', ']') ?: ""