httpcaddyfile: Fix incorrect handling of IPv6 bind addresses (#4532)

The `net.JoinHostPort()` function has some naiive logic for handling IPv6, it just checks if the host part has a `:` and if so it wraps the host part with `[ ]` but this causes our network type prefix to get wrapped as well, which is invalid for `caddy.NetworkAddress`. Instead, we can just concatenate the host and port manually here to avoid this side-effect.
This commit is contained in:
Francis Lavoie 2022-01-18 13:27:43 -05:00 committed by GitHub
parent 1a7a78a1f2
commit 93a7a45e7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions

View file

@ -223,7 +223,7 @@ func (st *ServerType) listenerAddrsForServerBlockKey(sblock serverBlock, key str
if err == nil && addr.IsUnixNetwork() { if err == nil && addr.IsUnixNetwork() {
listeners[host] = struct{}{} listeners[host] = struct{}{}
} else { } else {
listeners[net.JoinHostPort(host, lnPort)] = struct{}{} listeners[host+":"+lnPort] = struct{}{}
} }
} }

View file

@ -0,0 +1,29 @@
example.com {
bind tcp6/[::]
}
----------
{
"apps": {
"http": {
"servers": {
"srv0": {
"listen": [
"tcp6/[::]:443"
],
"routes": [
{
"match": [
{
"host": [
"example.com"
]
}
],
"terminal": true
}
]
}
}
}
}
}