CERBERUS/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-06-29 13:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix slice bounds when getting key of address (fixes #2706)

Browse source
This commit is contained in:
Matthew Holt 2019-08-14 10:41:25 -06:00
parent 28e1f7c562
commit a08ab0c007
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
caddyhttp/httpserver/plugin.go
View file

@ -490,11 +490,10 @@ func (a Address) Key() string {
if a.Host != "" {
res += a.Host
}
if a.Port != "" {
if strings.HasPrefix(a.Original[len(res):], ":"+a.Port) {
// insert port only if the original has its own explicit port
res += ":" + a.Port
}
// insert port only if the original has its own explicit port
if a.Port != "" && len(a.Original) >= len(res) &&
strings.HasPrefix(a.Original[len(res):], ":"+a.Port) {
res += ":" + a.Port
}
if a.Path != "" {
res += a.Path
@ -553,10 +552,12 @@ func standardizeAddress(str string) (Address, error) {
// standardize http and https ports to their respective port numbers
// (this behavior changed in Go 1.12.8)
if port == httpPort {
u.Scheme = "http"
} else if port == httpsPort {
u.Scheme = "https"
if u.Scheme == "" {
if port == httpPort {
u.Scheme = "http"
} else if port == httpsPort {
u.Scheme = "https"
}
}
return Address{Original: input, Scheme: u.Scheme, Host: host, Port: port, Path: u.Path}, nil