Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-31 10:37:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddyhttp: host labels placeholders endianness from right->left

Browse Source 
https://caddy.community/t/labeln-placeholder-endian-issue/5366

(I thought we had this before but it must have gotten lost somewhere)
This commit is contained in:
Matthew Holt 2019-10-14 12:09:43 -06:00
parent bc738991b6
commit acf7dea68f
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/caddyhttp/replacer.go
View File

@ -146,14 +146,18 @@ func addHTTPVarsToReplacer(repl caddy.Replacer, req *http.Request, w http.Respon
if err != nil {
return "", false
}
hostLabels := strings.Split(req.Host, ".")
reqHost, _, err := net.SplitHostPort(req.Host)
if err != nil {
reqHost = req.Host // OK; assume there was no port
}
hostLabels := strings.Split(reqHost, ".")
if idx < 0 {
return "", false
}
if idx >= len(hostLabels) {
if idx > len(hostLabels) {
return "", true
}
return hostLabels[idx], true
return hostLabels[len(hostLabels)-idx-1], true
}
// path parts

8
modules/caddyhttp/replacer_test.go
View File

@ -61,6 +61,14 @@ func TestHTTPVarReplacement(t *testing.T) {
input: "{http.request.remote.port}",
expect: "1234",
},
{
input: "{http.request.host.labels.0}",
expect: "com",
},
{
input: "{http.request.host.labels.1}",
expect: "example",
},
} {
actual := repl.ReplaceAll(tc.input, "<empty>")
if actual != tc.expect {