caddyhttp: Corrected host label index check (fix #3502)

caddyserver · Jun 30, 2020 · 77f233a · 77f233a
1 parent ddd690d
commit 77f233a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go
@@ -172,7 +172,7 @@ func addHTTPVarsToReplacer(repl *caddy.Replacer, req *http.Request, w http.Respo
 					reqHost = req.Host // OK; assume there was no port
 				}
 				hostLabels := strings.Split(reqHost, ".")
-				if idx > len(hostLabels) {
+				if idx >= len(hostLabels) {
 					return "", true
 				}
 				return hostLabels[len(hostLabels)-idx-1], true

diff --git a/modules/caddyhttp/replacer_test.go b/modules/caddyhttp/replacer_test.go
@@ -107,6 +107,10 @@ eqp31wM9il1n+guTNyxJd+FzVAH+hCZE5K+tCgVDdVFUlDEHHbS/wqb2PSIoouLV
 			input:  "{http.request.host.labels.1}",
 			expect: "example",
 		},
+		{
+			input:  "{http.request.host.labels.2}",
+			expect: "<empty>",
+		},
 		{
 			input:  "{http.request.tls.cipher_suite}",
 			expect: "TLS_AES_256_GCM_SHA384",