🐛 fix(cache): detect directives with OWS and value params

Author: nickzerjeski

middleware/cache/cache.go

@@ -907,24 +907,13 @@ func New(config ...Config) fiber.Handler {
 
 // hasDirective checks if a cache-control header contains a directive (case-insensitive)
 func hasDirective(cc, directive string) bool {
-	ccLen := len(cc)
-	dirLen := len(directive)
-	for i := 0; i <= ccLen-dirLen; i++ {
-		if !utils.EqualFold(cc[i:i+dirLen], directive) {
-			continue
-		}
-		if i > 0 {
-			prev := cc[i-1]
-			if prev != ' ' && prev != ',' {
-				continue
-			}
-		}
-		if i+dirLen == ccLen || cc[i+dirLen] == ',' {
-			return true
+	found := false
+	parseCacheControlDirectives([]byte(cc), func(key, _ []byte) {
+		if !found && utils.EqualFold(utils.UnsafeString(key), directive) {
+			found = true
 		}
-	}
-
-	return false
+	})
+	return found
 }
 
 func cacheBodyFetchError(mask func(string) string, key string, err error) error {

middleware/cache/cache_test.go

@@ -3046,6 +3046,35 @@ func Test_AllowsSharedCache(t *testing.T) {
 	})
 }
 
+func Test_HasDirective(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		header    string
+		directive string
+		expect    bool
+	}{
+		{header: "no-cache", directive: "no-cache", expect: true},
+		{header: "NO-CACHE", directive: "no-cache", expect: true},
+		{header: "no-cache ", directive: "no-cache", expect: true},
+		{header: "no-cache\t", directive: "no-cache", expect: true},
+		{header: "no-cache=\"Set-Cookie\"", directive: "no-cache", expect: true},
+		{header: "private ", directive: "private", expect: true},
+		{header: "public, private ", directive: "private", expect: true},
+		{header: "my-no-cache", directive: "no-cache", expect: false},
+		{header: "private-ish", directive: "private", expect: false},
+	}
+
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.header+"_"+tt.directive, func(t *testing.T) {
+			t.Parallel()
+			got := hasDirective(tt.header, tt.directive)
+			require.Equal(t, tt.expect, got)
+		})
+	}
+}
+
 func TestCacheSkipsAuthorizationByDefault(t *testing.T) {
 	t.Parallel()