- Do not require port in IPv6 outbound URI.

This commit is contained in:
Juha Heinanen
2020-01-15 04:07:56 +02:00
parent 670efd3354
commit 9fb67faeee
@@ -133,10 +133,6 @@ object Utils {
checkIpV6(bracketedIp.substring(1, bracketedIp.length - 2)) checkIpV6(bracketedIp.substring(1, bracketedIp.length - 2))
} }
private fun checkIp(ip: String): Boolean {
return checkIpV4(ip) || checkIpV6(ip)
}
private fun checkUriUser(user: String): Boolean { private fun checkUriUser(user: String): Boolean {
for (c in user) for (c in user)
if (!(c.isLetterOrDigit() || c in "-_.!~*'()&=+$,;?/")) return false if (!(c.isLetterOrDigit() || c in "-_.!~*'()&=+$,;?/")) return false
@@ -174,7 +170,7 @@ object Utils {
} }
fun checkHostPort(hostPort: String): Boolean { fun checkHostPort(hostPort: String): Boolean {
return checkIp(hostPort) || checkDomain(hostPort) || return checkIpV4(hostPort) || checkIpv6InBrackets(hostPort) || checkDomain(hostPort) ||
checkIpPort(hostPort) || checkDomainPort(hostPort) checkIpPort(hostPort) || checkDomainPort(hostPort)
} }