CERBERUS/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-08-31 07:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

caddyhttp: Add time.now placeholder and update cel-go (closes #2594)

Browse source
This commit is contained in:
Matthew Holt 2020-05-21 18:19:01 -06:00
parent bb67e19d7b
commit 0cbf467b3f
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/caddyhttp/celmatcher.go
View file

@ -21,10 +21,12 @@ import (
"reflect"
"regexp"
"strings"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/gogo/protobuf/proto"
"github.com/golang/protobuf/ptypes/timestamp"
"github.com/google/cel-go/cel"
"github.com/google/cel-go/checker/decls"
"github.com/google/cel-go/common/types"
@ -204,6 +206,9 @@ func (celTypeAdapter) NativeToValue(value interface{}) ref.Val {
switch v := value.(type) {
case celHTTPRequest:
return v
case time.Time:
// TODO: eliminate direct protobuf dependency, sigh -- just wrap stdlib time.Time instead...
return types.Timestamp{Timestamp: &timestamp.Timestamp{Seconds: v.Unix(), Nanos: int32(v.Nanosecond())}}
case error:
types.NewErr(v.Error())
}