fix(android): strip ws scheme prefix from manual gateway host input (#99110)

ly85206559 · cursoragent · steipete · web-flow · commit a51b06fd4d37 · 2026-07-02T11:43:31.000-07:00
* fix(android): strip ws scheme prefix from manual gateway host input Reject bare ws:// in the Host field and normalize pasted ws:// LAN URLs so manual onboarding resolves the real hostname instead of host ws. Fixes #87216. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(android): preserve complete manual gateway endpoints * fix(android): preserve gateway i18n inventory --------- Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Peter Steinberger <steipete@gmail.com>
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt b/apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt
@@ -164,7 +164,7 @@ internal fun parseGatewayEndpointResult(rawInput: String): GatewayEndpointParseR
   }
   val defaultPort = if (tls) 443 else 18789
   val displayPort = if (tls) 443 else 80
-  val port = uri.port.takeIf { it in 1..65535 } ?: defaultPort
+  val port = gatewayPort(uri.port, defaultPort) ?: return GatewayEndpointParseResult(error = GatewayEndpointValidationError.INVALID_URL)
   val displayHost = if (host.contains(":")) "[$host]" else host
   val displayUrl =
     if (port == displayPort && defaultPort == displayPort) {
@@ -244,6 +244,13 @@ internal fun gatewayEndpointValidationMessage(
       }
   }
 
+private fun gatewayPort(port: Int, defaultPort: Int): Int? =
+  when {
+    port == -1 -> defaultPort
+    port in 1..65535 -> port
+    else -> null
+  }
+
 /** Builds a URL from manual host/port/tls fields for shared endpoint parsing. */
 internal fun composeGatewayManualUrl(
   hostInput: String,
@@ -252,6 +259,14 @@ internal fun composeGatewayManualUrl(
 ): String? {
   val host = hostInput.trim()
   if (host.isEmpty()) return null
+  // A pasted endpoint is already a complete authority; its scheme and port
+  // must not be silently replaced by stale values from the separate controls.
+  if (host.contains("://")) {
+    val parsed = parseGatewayEndpointResult(host)
+    return host.takeUnless { parsed.error == GatewayEndpointValidationError.INVALID_URL }
+  }
+  val bareHost = host.trimEnd('/')
+  if (bareHost.isEmpty() || bareHost.contains('/')) return null
   val portTrimmed = portInput.trim()
   val port =
     if (portTrimmed.isEmpty()) {
@@ -261,7 +276,7 @@ internal fun composeGatewayManualUrl(
     }
   if (port !in 1..65535) return null
   val scheme = if (tls) "https" else "http"
-  return "$scheme://${ai.openclaw.app.gateway.formatGatewayAuthority(host, port)}"
+  return "$scheme://${ai.openclaw.app.gateway.formatGatewayAuthority(bareHost, port)}"
 }
 
 private fun parseJsonObject(input: String): JsonObject? = runCatching { gatewaySetupJson.parseToJsonElement(input).jsonObject }.getOrNull()
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/ui/GatewayConfigResolverTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/ui/GatewayConfigResolverTest.kt
@@ -351,6 +351,14 @@ class GatewayConfigResolverTest {
     assertEquals(GatewayEndpointValidationError.INVALID_URL, parsed.error)
   }
 
+  @Test
+  fun parseGatewayEndpointResultRejectsInvalidExplicitPort() {
+    val parsed = parseGatewayEndpointResult("wss://gateway.example:70000")
+
+    assertNull(parsed.config)
+    assertEquals(GatewayEndpointValidationError.INVALID_URL, parsed.error)
+  }
+
   @Test
   fun parseGatewayEndpointResultAllowsPrivateLanCleartextGateway() {
     val parsed = parseGatewayEndpointResult("ws://192.168.1.20:18789")
@@ -592,6 +600,66 @@ class GatewayConfigResolverTest {
     assertEquals(false, resolved?.tls)
   }
 
+  @Test
+  fun composeGatewayManualUrlRejectsBareScheme() {
+    assertNull(composeGatewayManualUrl("ws://", "18789", tls = false))
+  }
+
+  @Test
+  fun composeGatewayManualUrlPreservesCompleteEndpoint() {
+    val cleartextUrl = composeGatewayManualUrl("ws://192.168.178.57:18790", "18789", tls = true)
+    val tlsUrl = composeGatewayManualUrl("wss://gateway.example:443", "18789", tls = false)
+
+    assertEquals("ws://192.168.178.57:18790", cleartextUrl)
+    assertEquals("wss://gateway.example:443", tlsUrl)
+    assertEquals("http://192.168.178.57:18790", parseGatewayEndpoint(cleartextUrl!!)?.displayUrl)
+    assertEquals("https://gateway.example", parseGatewayEndpoint(tlsUrl!!)?.displayUrl)
+  }
+
+  @Test
+  fun composeGatewayManualUrlPreservesCompleteEndpointValidationError() {
+    val url = composeGatewayManualUrl("ws://gateway.example:18789", "18789", tls = false)
+
+    assertEquals(GatewayEndpointValidationError.INSECURE_REMOTE_URL, parseGatewayEndpointResult(url!!).error)
+  }
+
+  @Test
+  fun resolveGatewayConnectConfigManualAcceptsCompleteLanEndpoint() {
+    val resolved =
+      resolveGatewayConnectConfig(
+        useSetupCode = false,
+        setupCode = "",
+        savedManualHost = "",
+        savedManualPort = "",
+        savedManualTls = false,
+        manualHostInput = "ws://192.168.178.57:18790",
+        manualPortInput = "18789",
+        manualTlsInput = true,
+        fallbackBootstrapToken = "",
+        fallbackToken = "",
+        fallbackPassword = "",
+      )
+
+    assertEquals("192.168.178.57", resolved?.host)
+    assertEquals(18790, resolved?.port)
+    assertEquals(false, resolved?.tls)
+  }
+
+  @Test
+  fun composeGatewayManualUrlPreservesIpv6Hosts() {
+    for (hostInput in listOf("::1", "[::1]")) {
+      assertEquals("http://[::1]:18789", composeGatewayManualUrl(hostInput, "18789", tls = false))
+    }
+  }
+
+  @Test
+  fun composeGatewayManualUrlTrimsTrailingSlashFromBareHost() {
+    assertEquals(
+      "http://192.168.1.20:20000",
+      composeGatewayManualUrl("192.168.1.20/", "20000", tls = false),
+    )
+  }
+
   @Test
   fun composeGatewayManualUrlDefaultsPortTo443WhenTlsAndPortBlank() {
     val url = composeGatewayManualUrl("mydevice.tail1234.ts.net", "", tls = true)
