fix: REQUEST_HEADER tags search on replacement

achetronic · Oct 10, 2024 · 150ce3e · 150ce3e
1 parent 58255b9
commit 150ce3e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 25 deletions.
diff --git a/charts/hashrouter/Chart.yaml b/charts/hashrouter/Chart.yaml
@@ -5,7 +5,7 @@ type: application
 description: >-
   A Helm chart for hashrouter, a A zero-dependencies HTTP proxy
   that truly routes requests hash-consistently
-version: &chartVersionSpec 0.11.0 # chart version
+version: &chartVersionSpec 0.11.1 # chart version
 appVersion: *chartVersionSpec # application version
 kubeVersion: ">=1.22.0-0" # kubernetes version
 home: https://github.com/achetronic/hashrouter

diff --git a/internal/proxy/common.go b/internal/proxy/common.go
@@ -1,7 +1,6 @@
 package proxy
 
 import (
-	"hashrouter/internal/utils"
 	"net"
 	"net/http"
 	"regexp"
@@ -50,7 +49,7 @@ func ReplaceRequestTags(req *http.Request, textToProcess string) (result string)
 
 	result = RequestPartsPatternCompiled.ReplaceAllStringFunc(textToProcess, func(match string) string {
 
-		variable := RequestPartsPatternCompiled.FindStringSubmatch(match)[1]
+		variable := strings.ToLower(RequestPartsPatternCompiled.FindStringSubmatch(match)[1])
 
 		if replacement, exists := requestTags[variable]; exists {
 			return replacement
@@ -68,8 +67,8 @@ func ReplaceRequestHeaderTags(req *http.Request, textToProcess string) (result s
 
 	result = RequestHeadersPatternCompiled.ReplaceAllStringFunc(textToProcess, func(match string) string {
 
-		variable := RequestHeadersPatternCompiled.FindStringSubmatch(match)[1]
-		headerValue := req.Header.Get(utils.CapitalizeWords(variable))
+		variable := strings.ToLower(RequestHeadersPatternCompiled.FindStringSubmatch(match)[1])
+		headerValue := req.Header.Get(variable)
 
 		return headerValue
 	})
@@ -83,8 +82,8 @@ func ReplaceResponseHeaderTags(res *http.Response, textToProcess string) (result
 
 	result = ResponseHeadersPatternCompiled.ReplaceAllStringFunc(textToProcess, func(match string) string {
 
-		variable := ResponseHeadersPatternCompiled.FindStringSubmatch(match)[1]
-		headerValue := res.Header.Get(utils.CapitalizeWords(variable))
+		variable := strings.ToLower(ResponseHeadersPatternCompiled.FindStringSubmatch(match)[1])
+		headerValue := res.Header.Get(variable)
 
 		return headerValue
 	})
@@ -99,7 +98,7 @@ func ReplaceExtraTags(extra ConnectionExtraData, textToProcess string) (result s
 
 	result = ExtraPatternCompiled.ReplaceAllStringFunc(textToProcess, func(match string) string {
 
-		variable := ExtraPatternCompiled.FindStringSubmatch(match)[1]
+		variable := strings.ToLower(ExtraPatternCompiled.FindStringSubmatch(match)[1])
 
 		switch variable {
 		case "request-id":

diff --git a/internal/utils/utils.go b/internal/utils/utils.go