Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
go.mod: Update some deps; add new Strings lib to CEL matcher
Matthew Holt committed
Mar 20, 2020 at 08:53 UTC
903776238ebc559c6ed003613a7f7a4d6ceb809a
3 files changed
+11
-7
go.mod
+3
-3
@@ -10,14 +10,14 @@ require (
10
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac
11
github.com/go-acme/lego/v3 v3.5.0
12
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
13
- github.com/google/cel-go v0.3.2
13
+ github.com/google/cel-go v0.4.0
14
github.com/ilibs/json5 v1.0.1
15
github.com/jsternberg/zap-logfmt v1.2.0
16
github.com/klauspost/compress v1.10.3
17
github.com/klauspost/cpuid v1.2.3
18
github.com/lucas-clemente/quic-go v0.15.2
19
github.com/manifoldco/promptui v0.7.0 // indirect
20
- github.com/miekg/dns v1.1.28 // indirect
20
+ github.com/miekg/dns v1.1.29 // indirect
21
github.com/muhammadmuzzammil1998/jsonc v0.0.0-20200303171503-1e787b591db7
22
github.com/naoina/go-stringutil v0.1.0 // indirect
23
github.com/naoina/toml v0.1.1
@@ -29,7 +29,7 @@ require (
29
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691
30
go.uber.org/zap v1.14.1
31
golang.org/x/crypto v0.0.0-20200317142112-1b76d66859c6
32
- golang.org/x/net v0.0.0-20200301022130-244492dfa37a
32
+ golang.org/x/net v0.0.0-20200319234117-63522dbf7eec
33
google.golang.org/genproto v0.0.0-20200305110556-506484158171
34
gopkg.in/natefinch/lumberjack.v2 v2.0.0
35
gopkg.in/square/go-jose.v2 v2.4.1 // indirect
go.sum
+6
-4
@@ -300,8 +300,8 @@ github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod h1:qOQCunE
300
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ=
301
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
302
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
303
-github.com/google/cel-go v0.3.2 h1:72Lj/nrfpWSJkuXdeEGB/7jfdwVFtV8kPJSL2Mt9rog=
304
-github.com/google/cel-go v0.3.2/go.mod h1:DoRSdzaJzNiP1lVuWhp/RjSnHLDQr/aNPlyqSBasBqA=
303
+github.com/google/cel-go v0.4.0 h1:9i5p9ms/kph/Lau3qL7DtnF49g3+/iBoi3KrMdnPTOU=
304
+github.com/google/cel-go v0.4.0/go.mod h1:F0UncVAXNlNjl/4C8hqGdoV6APmuFpetoMJSLIQLBPU=
305
github.com/google/cel-spec v0.3.0/go.mod h1:MjQm800JAGhOZXI7vatnVpmIaFTR6L8FHcKk+piiKpI=
306
github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
307
github.com/google/certificate-transparency-go v1.1.0/go.mod h1:i+Q7XY+ArBveOUT36jiHGfuSK1fHICIg6sUkRxPAbCs=
@@ -475,8 +475,8 @@ github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00v
475
github.com/miekg/dns v1.1.15 h1:CSSIDtllwGLMoA6zjdKnaE6Tx6eVUxQ29LUgGetiDCI=
476
github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
477
github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
478
-github.com/miekg/dns v1.1.28 h1:gQhy5bsJa8zTlVI8lywCTZp1lguor+xevFoYlzeCTQY=
479
-github.com/miekg/dns v1.1.28/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
478
+github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=
479
+github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
480
github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
481
github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
482
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
@@ -896,6 +896,8 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL
896
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
897
golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
898
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
899
+golang.org/x/net v0.0.0-20200319234117-63522dbf7eec h1:w0SItUiQ4sBiXBAwWNkyu8Fu2Qpn/dtDIcoPkPDqjRw=
900
+golang.org/x/net v0.0.0-20200319234117-63522dbf7eec/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
901
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
902
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
903
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
modules/caddyhttp/celmatcher.go
+2
@@ -29,6 +29,7 @@ import (
29
"github.com/google/cel-go/common/types"
30
"github.com/google/cel-go/common/types/ref"
31
"github.com/google/cel-go/common/types/traits"
32
+ "github.com/google/cel-go/ext"
33
"github.com/google/cel-go/interpreter/functions"
34
exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
35
)
@@ -88,6 +89,7 @@ func (m *MatchExpression) Provision(_ caddy.Context) error {
89
decls.String)),
90
),
91
cel.CustomTypeAdapter(celHTTPRequestTypeAdapter{}),
92
+ ext.Strings(),
93
)
94
if err != nil {
95
return fmt.Errorf("setting up CEL environment: %v", err)