vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-04 11:50:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow blank TLS manual port default (#63134) (thanks @Tyler-RNG)

Browse Source 
* make port optional for TLS manual connections

* fix: restrict manual blank-port fallback to tls

* fix: allow blank TLS manual port default (#63134) (thanks @Tyler-RNG)

---------

Co-authored-by: Ayaan Zaidi <hi@obviy.us>
This commit is contained in:
Tyler Warburton
2026-04-08 09:24:03 -04:00
committed by GitHub
parent 307979a4c7
commit a48c1e8cca
5 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt
View File

@@ -464,14 +464,18 @@ fun ConnectTabScreen(viewModel: MainViewModel) {
colors = outlinedColors(),
)
Text("Port", style = mobileCaption1.copy(fontWeight = FontWeight.SemiBold), color = mobileTextSecondary)
Text(
if (manualTlsInput) "Port (optional, defaults to 443)" else "Port",
style = mobileCaption1.copy(fontWeight = FontWeight.SemiBold),
color = mobileTextSecondary,
)
OutlinedTextField(
value = manualPortInput,
onValueChange = {
manualPortInput = it
validationText = null
},
placeholder = { Text("18789", style = mobileBody, color = mobileTextTertiary) },
placeholder = { Text(if (manualTlsInput) "443" else "18789", style = mobileBody, color = mobileTextTertiary) },
modifier = Modifier.fillMaxWidth(),
singleLine = true,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),

12
apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt
View File

@@ -235,15 +235,21 @@ internal fun gatewayEndpointValidationMessage(
when (source) {
GatewayEndpointInputSource.SETUP_CODE -> "Setup code has invalid gateway URL."
GatewayEndpointInputSource.QR_SCAN -> "QR code did not contain a valid setup code."
GatewayEndpointInputSource.MANUAL -> "Enter a valid manual host and port to connect."
GatewayEndpointInputSource.MANUAL -> "Enter a valid manual endpoint to connect."
}
}
}
internal fun composeGatewayManualUrl(hostInput: String, portInput: String, tls: Boolean): String? {
val host = hostInput.trim()
val port = portInput.trim().toIntOrNull() ?: return null
if (host.isEmpty() || port !in 1..65535) return null
if (host.isEmpty()) return null
val portTrimmed = portInput.trim()
val port = if (portTrimmed.isEmpty()) {
if (tls) 443 else return null
} else {
portTrimmed.toIntOrNull() ?: return null
}
if (port !in 1..65535) return null
val scheme = if (tls) "https" else "http"
return "$scheme://$host:$port"
}

8
apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt
View File

@@ -1148,11 +1148,15 @@ private fun GatewayStep(
onboardingTextFieldColors(),
)
Text("PORT", style = onboardingCaption1Style.copy(letterSpacing = 0.9.sp), color = onboardingTextSecondary)
Text(
if (manualTls) "PORT (optional, defaults to 443)" else "PORT",
style = onboardingCaption1Style.copy(letterSpacing = 0.9.sp),
color = onboardingTextSecondary,
)
OutlinedTextField(
value = manualPort,
onValueChange = onManualPortChange,
placeholder = { Text("18789", color = onboardingTextTertiary, style = onboardingBodyStyle) },
placeholder = { Text(if (manualTls) "443" else "18789", color = onboardingTextTertiary, style = onboardingBodyStyle) },
modifier = Modifier.fillMaxWidth(),
singleLine = true,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),

36
apps/android/app/src/test/java/ai/openclaw/app/ui/GatewayConfigResolverTest.kt
View File

@@ -464,6 +464,42 @@ class GatewayConfigResolverTest {
assertEquals(false, resolved?.tls)
}
@Test
fun composeGatewayManualUrlDefaultsPortTo443WhenTlsAndPortBlank() {
val url = composeGatewayManualUrl("mydevice.tail1234.ts.net", "", tls = true)
assertEquals("https://mydevice.tail1234.ts.net:443", url)
}
@Test
fun composeGatewayManualUrlRejectsBlankPortWhenTlsIsOff() {
val url = composeGatewayManualUrl("127.0.0.1", "", tls = false)
assertNull(url)
}
@Test
fun resolveGatewayConnectConfigManualAcceptsTailscaleHostWithoutPort() {
val resolved =
resolveGatewayConnectConfig(
useSetupCode = false,
setupCode = "",
savedManualHost = "",
savedManualPort = "",
savedManualTls = true,
manualHostInput = "mydevice.tail1234.ts.net",
manualPortInput = "",
manualTlsInput = true,
fallbackBootstrapToken = "",
fallbackToken = "",
fallbackPassword = "",
)
assertEquals("mydevice.tail1234.ts.net", resolved?.host)
assertEquals(443, resolved?.port)
assertEquals(true, resolved?.tls)
}
private fun encodeSetupCode(payloadJson: String): String {
return Base64.getUrlEncoder().withoutPadding().encodeToString(payloadJson.toByteArray(Charsets.UTF_8))
}