Make sure that manifest URL is using base url while checking (#6530)

Author: TimoPtr

app/src/main/kotlin/io/homeassistant/companion/android/settings/url/ExternalUrlViewModel.kt

@@ -63,7 +63,7 @@ class ExternalUrlViewModel @Inject constructor(
         viewModelScope.launch {
             serverManager.getServer(serverId)?.let {
                 try {
-                    val formatted = UrlUtil.formattedUrlString(url)
+                    val formatted = UrlUtil.extractBaseUrl(url)
                     serverManager.updateServer(
                         it.copy(
                             connection = it.connection.copy(

common/src/main/kotlin/io/homeassistant/companion/android/common/data/connectivity/DefaultConnectivityChecker.kt

@@ -3,6 +3,7 @@ package io.homeassistant.companion.android.common.data.connectivity
 import androidx.annotation.StringRes
 import io.homeassistant.companion.android.common.R as commonR
 import io.homeassistant.companion.android.common.util.kotlinJsonMapper
+import io.homeassistant.companion.android.util.UrlUtil
 import java.io.BufferedReader
 import java.net.HttpURLConnection
 import java.net.InetAddress
@@ -95,7 +96,7 @@ internal class DefaultConnectivityChecker @Inject constructor() : ConnectivityCh
 
     override suspend fun homeAssistant(url: String): ConnectivityCheckResult = withContext(Dispatchers.IO) {
         try {
-            val manifestUrl = URL("$url/manifest.json")
+            val manifestUrl = URL("${UrlUtil.extractBaseUrl(url)}manifest.json")
             val connection = manifestUrl.openConnection()
             connection.connectTimeout = CONNECTIVITY_TIMEOUT.inWholeMilliseconds.toInt()
             connection.readTimeout = CONNECTIVITY_TIMEOUT.inWholeMilliseconds.toInt()

common/src/main/kotlin/io/homeassistant/companion/android/util/UrlUtil.kt

@@ -15,7 +15,15 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import timber.log.Timber
 
 object UrlUtil {
-    fun formattedUrlString(url: String): String {
+    /**
+     * Extracts the base URL (scheme, host, and port) from the given URL string,
+     * stripping any path, query parameters, and fragments.
+     *
+     * @param url the full URL string to extract the base from
+     * @return the base URL containing only the scheme, host, and port, with a trailing `/`
+     * @throws MalformedHttpUrlException if [url] is empty or not a valid HTTP(S) URL
+     */
+    fun extractBaseUrl(url: String): String {
         return if (url == "") {
             throw MalformedHttpUrlException()
         } else {

common/src/test/kotlin/io/homeassistant/companion/android/util/UrlUtilTest.kt

@@ -1,5 +1,6 @@
 package io.homeassistant.companion.android.util
 
+import io.homeassistant.companion.android.common.data.MalformedHttpUrlException
 import java.net.URL
 import kotlinx.coroutines.test.runTest
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -10,6 +11,7 @@ import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
 import org.junit.jupiter.params.provider.ValueSource
@@ -29,6 +31,41 @@ class UrlUtilTest {
         baseUrl = URL("https://example.com:8123/")
     }
 
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "https://example.com:8123/path/to/page?query=1#fragment, https://example.com:8123/",
+            "http://homeassistant.local:8123, http://homeassistant.local:8123/",
+            "https://my.domain.com, https://my.domain.com/",
+            "http://192.168.1.1:8123/lovelace, http://192.168.1.1:8123/",
+            "https://ha.example.com:443, https://ha.example.com/",
+        ],
+    )
+    fun `Given valid URL when calling extractBaseUrl then returns scheme host and port only`(input: String, expected: String) {
+        assertEquals(expected, UrlUtil.extractBaseUrl(input))
+    }
+
+    @Test
+    fun `Given empty string when calling extractBaseUrl then throws MalformedHttpUrlException`() {
+        assertThrows(MalformedHttpUrlException::class.java) {
+            UrlUtil.extractBaseUrl("")
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+        strings = [
+            "not a url",
+            "ftp://example.com",
+            "://missing-scheme",
+        ],
+    )
+    fun `Given invalid URL when calling extractBaseUrl then throws MalformedHttpUrlException`(input: String) {
+        assertThrows(MalformedHttpUrlException::class.java) {
+            UrlUtil.extractBaseUrl(input)
+        }
+    }
+
     @ParameterizedTest
     @CsvSource(
         value = [