fileserver: fix try_policy when instantiating file matcher from CEL

caddyserver · Oct 13, 2024 · 8bb71ce · 8bb71ce
1 parent 48ce47f
commit 8bb71ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/modules/caddyhttp/fileserver/matcher.go b/modules/caddyhttp/fileserver/matcher.go
@@ -191,7 +191,7 @@ func (MatchFile) CELLibrary(ctx caddy.Context) (cel.Library, error) {
 
 		var try_policy string
 		if len(values["try_policy"]) > 0 {
-			root = values["try_policy"][0]
+			try_policy = values["try_policy"][0]
 		}
 
 		m := MatchFile{

diff --git a/modules/caddyhttp/fileserver/matcher_test.go b/modules/caddyhttp/fileserver/matcher_test.go
@@ -354,6 +354,14 @@ var expressionTests = []struct {
 		urlTarget:  "https://example.com/nopenope.txt",
 		wantResult: false,
 	},
+	{
+		name: "file match long pattern foo.txt with try_policy (MatchFile)",
+		expression: &caddyhttp.MatchExpression{
+			Expr: `file({"try_policy": "most_recently_modified"})`,
+		},
+		urlTarget:  "https://example.com/foo.txt",
+		wantResult: true,
+	},
 }
 
 func TestMatchExpressionMatch(t *testing.T) {