Removed Content-length from coping

evg4b · Dec 13, 2023 · 0787263 · 0787263
1 parent 4ecc45e
commit 0787263
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -24,6 +24,7 @@ require (
 )
 
 require (
+	github.com/deckarep/golang-set/v2 v2.5.0 // indirect
 	github.com/sagikazarmark/locafero v0.3.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect

diff --git a/go.sum b/go.sum
@@ -76,6 +76,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/deckarep/golang-set/v2 v2.5.0 h1:hn6cEZtQ0h3J8kFrHR/NrzyOoTnjgW1+FmNJzQ7y/sA=
+github.com/deckarep/golang-set/v2 v2.5.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

diff --git a/internal/handler/proxy/helpers.go b/internal/handler/proxy/helpers.go
@@ -2,31 +2,39 @@ package proxy
 
 import (
 	"net/http"
-	"strings"
 
+	mapset "github.com/deckarep/golang-set/v2"
 	"github.com/go-http-utils/headers"
 )
 
+var excluded = mapset.NewSet[string](
+	headers.Cookie,
+	headers.SetCookie,
+	headers.ContentLength,
+)
+
 type modificationsMap = map[string]func(string) (string, error)
 
 func noop(s string) (string, error) { return s, nil }
 
 func copyHeaders(source, dest http.Header, modifications modificationsMap) error {
 	for key, values := range source {
-		if !strings.EqualFold(key, headers.Cookie) && !strings.EqualFold(key, headers.SetCookie) {
-			modificationFunc, ok := modifications[headers.Normalize(key)]
-			if !ok {
-				modificationFunc = noop
-			}
+		if excluded.Contains(key) {
+			continue
+		}
 
-			for _, value := range values {
-				modifiedValue, err := modificationFunc(value)
-				if err != nil {
-					return err
-				}
+		modificationFunc, ok := modifications[headers.Normalize(key)]
+		if !ok {
+			modificationFunc = noop
+		}
 
-				dest.Add(key, modifiedValue)
+		for _, value := range values {
+			modifiedValue, err := modificationFunc(value)
+			if err != nil {
+				return err
 			}
+
+			dest.Add(key, modifiedValue)
 		}
 	}