blackbeard420/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-03-09 15:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge e8f8fc2948734c83f7aecc31b1dd39af169355f1 into 8861eae22350d9e8f94653db951faf85a50a82da

Browse Source
This commit is contained in:
Mohammed Al Sahaf 2025-03-03 11:21:10 -05:00 committed by GitHub
commit 6d9db78804
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/caddyhttp/celmatcher.go
View File

@ -37,6 +37,7 @@ import (
"github.com/google/cel-go/interpreter/functions" "github.com/google/cel-go/interpreter/functions"
"github.com/google/cel-go/parser" "github.com/google/cel-go/parser"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/protobuf/types/known/structpb"
"github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
@ -642,8 +643,9 @@ func celMatcherJSONMacroExpander(funcName string) parser.MacroExpander {
if !isStringPlaceholder { if !isStringPlaceholder {
return nil, eh.NewError(entry.ID(), "matcher map keys must be string literals") return nil, eh.NewError(entry.ID(), "matcher map keys must be string literals")
} }
isNull := entry.AsMapEntry().Value().AsLiteral().Type() == types.NullType
isStringListPlaceholder := isCELStringExpr(entry.AsMapEntry().Value()) || isStringListPlaceholder := isCELStringExpr(entry.AsMapEntry().Value()) ||
isCELStringListLiteral(entry.AsMapEntry().Value()) isCELStringListLiteral(entry.AsMapEntry().Value()) || isNull
if !isStringListPlaceholder { if !isStringListPlaceholder {
return nil, eh.NewError(entry.AsMapEntry().Value().ID(), "matcher map values must be string or list literals") return nil, eh.NewError(entry.AsMapEntry().Value().ID(), "matcher map values must be string or list literals")
} }
@ -674,6 +676,8 @@ func CELValueToMapStrList(data ref.Val) (map[string][]string, error) {
mapStrListStr := make(map[string][]string, len(mapStrIface)) mapStrListStr := make(map[string][]string, len(mapStrIface))
for k, v := range mapStrIface { for k, v := range mapStrIface {
switch val := v.(type) { switch val := v.(type) {
case structpb.NullValue:
mapStrListStr[k] = nil
case string: case string:
mapStrListStr[k] = []string{val} mapStrListStr[k] = []string{val}
case types.String: case types.String:
@ -787,7 +791,7 @@ var (
escapedPlaceholderRegexp = regexp.MustCompile(`\\{([a-zA-Z][\w.-]+)}`) escapedPlaceholderRegexp = regexp.MustCompile(`\\{([a-zA-Z][\w.-]+)}`)
escapedPlaceholderExpansion = `{${1}}` escapedPlaceholderExpansion = `{${1}}`
CELTypeJSON = cel.MapType(cel.StringType, cel.DynType) CELTypeJSON = cel.MapType(cel.StringType, cel.AnyType)
) )
var httpRequestObjectType = cel.ObjectType("http.Request") var httpRequestObjectType = cel.ObjectType("http.Request")