mirror of https://github.com/openclaw/openclaw.git
fix: default Android TLS setup codes to port 443
This commit is contained in:
parent
8bc163d15f
commit
df765f602b
|
|
@ -97,7 +97,7 @@ internal fun parseGatewayEndpoint(rawInput: String): GatewayEndpointConfig? {
|
||||||
"wss", "https" -> true
|
"wss", "https" -> true
|
||||||
else -> true
|
else -> true
|
||||||
}
|
}
|
||||||
val port = uri.port.takeIf { it in 1..65535 } ?: 18789
|
val port = uri.port.takeIf { it in 1..65535 } ?: if (tls) 443 else 18789
|
||||||
val displayUrl = "${if (tls) "https" else "http"}://$host:$port"
|
val displayUrl = "${if (tls) "https" else "http"}://$host:$port"
|
||||||
|
|
||||||
return GatewayEndpointConfig(host = host, port = port, tls = tls, displayUrl = displayUrl)
|
return GatewayEndpointConfig(host = host, port = port, tls = tls, displayUrl = displayUrl)
|
||||||
|
|
|
||||||
|
|
@ -92,6 +92,30 @@ class GatewayConfigResolverTest {
|
||||||
assertNull(resolved?.password?.takeIf { it.isNotEmpty() })
|
assertNull(resolved?.password?.takeIf { it.isNotEmpty() })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun resolveGatewayConnectConfigDefaultsPortlessWssSetupCodeTo443() {
|
||||||
|
val setupCode =
|
||||||
|
encodeSetupCode("""{"url":"wss://gateway.example","bootstrapToken":"bootstrap-1"}""")
|
||||||
|
|
||||||
|
val resolved =
|
||||||
|
resolveGatewayConnectConfig(
|
||||||
|
useSetupCode = true,
|
||||||
|
setupCode = setupCode,
|
||||||
|
manualHost = "",
|
||||||
|
manualPort = "",
|
||||||
|
manualTls = true,
|
||||||
|
fallbackToken = "shared-token",
|
||||||
|
fallbackPassword = "shared-password",
|
||||||
|
)
|
||||||
|
|
||||||
|
assertEquals("gateway.example", resolved?.host)
|
||||||
|
assertEquals(443, resolved?.port)
|
||||||
|
assertEquals(true, resolved?.tls)
|
||||||
|
assertEquals("bootstrap-1", resolved?.bootstrapToken)
|
||||||
|
assertNull(resolved?.token?.takeIf { it.isNotEmpty() })
|
||||||
|
assertNull(resolved?.password?.takeIf { it.isNotEmpty() })
|
||||||
|
}
|
||||||
|
|
||||||
private fun encodeSetupCode(payloadJson: String): String {
|
private fun encodeSetupCode(payloadJson: String): String {
|
||||||
return Base64.getUrlEncoder().withoutPadding().encodeToString(payloadJson.toByteArray(Charsets.UTF_8))
|
return Base64.getUrlEncoder().withoutPadding().encodeToString(payloadJson.toByteArray(Charsets.UTF_8))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue