Skip to content

Commit b42016d

Browse files
committed
chore(deps): Update google.golang.org/grpc and golang.org/x/net
Reason: GHSA-m425-mq94-257g > Impact > > In affected releases of gRPC-Go, it is possible for an attacker to > send HTTP/2 requests, cancel them, and send subsequent requests, which > is valid by the HTTP/2 protocol, but would cause the gRPC-Go server to > launch more concurrent method handlers than the configured maximum > stream limit. > > Patches > > This vulnerability was addressed by #6703 and has been included in > patch releases: 1.56.3, 1.57.1, 1.58.3. It is also included in the > latest release, 1.59.0. > > Along with applying the patch, users should also ensure they are using > the grpc.MaxConcurrentStreams server option to apply a limit to the > server's resources used for any single connection. > > Workarounds > > None. References: * GHSA-m425-mq94-257g * grpc/grpc-go#6703 Signed-off-by: Balazs Nadasdi <balazs@weave.works>
1 parent eac574d commit b42016d

File tree

2 files changed

+421
-58
lines changed

2 files changed

+421
-58
lines changed

go.mod

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/aws/aws-sdk-go-v2/service/s3 v1.38.5
1616
github.com/cyphar/filepath-securejoin v0.2.4
1717
github.com/elgohr/go-localstack v1.0.20
18-
github.com/fluxcd/flux2/v2 v2.1.1
1918
github.com/fluxcd/pkg/apis/event v0.5.2
2019
github.com/fluxcd/pkg/apis/meta v1.1.2
2120
github.com/fluxcd/pkg/runtime v0.42.0
@@ -41,8 +40,8 @@ require (
4140
github.com/weaveworks/tf-controller/api v0.0.0-00010101000000-000000000000
4241
github.com/weaveworks/tf-controller/tfctl v0.0.0-00010101000000-000000000000
4342
github.com/zclconf/go-cty v1.13.2
44-
golang.org/x/net v0.15.0
45-
google.golang.org/grpc v1.55.0
43+
golang.org/x/net v0.17.0
44+
google.golang.org/grpc v1.56.3
4645
google.golang.org/protobuf v1.31.0
4746
gopkg.in/yaml.v2 v2.4.0
4847
k8s.io/api v0.28.0
@@ -95,20 +94,12 @@ require (
9594
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
9695
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
9796
github.com/fatih/color v1.13.0 // indirect
98-
github.com/fluxcd/helm-controller/api v0.36.1 // indirect
99-
github.com/fluxcd/image-automation-controller/api v0.36.1 // indirect
100-
github.com/fluxcd/image-reflector-controller/api v0.30.0 // indirect
101-
github.com/fluxcd/kustomize-controller/api v1.1.0 // indirect
102-
github.com/fluxcd/notification-controller/api v1.1.0 // indirect
10397
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
104-
github.com/fluxcd/pkg/apis/kustomize v1.1.1 // indirect
105-
github.com/fluxcd/pkg/kustomize v1.3.4 // indirect
106-
github.com/fluxcd/pkg/oci v0.31.0 // indirect
10798
github.com/fluxcd/pkg/ssa v0.32.0 // indirect
10899
github.com/fluxcd/pkg/tar v0.2.0 // indirect
109-
github.com/fluxcd/pkg/version v0.2.2 // indirect
110100
github.com/fsnotify/fsnotify v1.6.0 // indirect
111101
github.com/go-errors/errors v1.4.2 // indirect
102+
github.com/go-git/go-git/v5 v5.9.0 // indirect
112103
github.com/go-logr/zapr v1.2.4 // indirect
113104
github.com/go-openapi/jsonpointer v0.19.6 // indirect
114105
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -119,11 +110,11 @@ require (
119110
github.com/google/btree v1.1.2 // indirect
120111
github.com/google/gnostic v0.6.9 // indirect
121112
github.com/google/go-cmp v0.5.9 // indirect
122-
github.com/google/go-containerregistry v0.16.1 // indirect
123113
github.com/google/gofuzz v1.2.0 // indirect
124114
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
125115
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
126116
github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b // indirect
117+
github.com/hashicorp/errwrap v1.1.0 // indirect
127118
github.com/hashicorp/go-version v1.6.0 // indirect
128119
github.com/hashicorp/hcl v1.0.0 // indirect
129120
github.com/huandu/xstrings v1.3.3 // indirect
@@ -162,6 +153,7 @@ require (
162153
github.com/prometheus/procfs v0.10.1 // indirect
163154
github.com/rivo/uniseg v0.2.0 // indirect
164155
github.com/russross/blackfriday/v2 v2.1.0 // indirect
156+
github.com/sergi/go-diff v1.3.1 // indirect
165157
github.com/shopspring/decimal v1.2.0 // indirect
166158
github.com/shurcooL/githubv4 v0.0.0-20190718010115-4ba037080260 // indirect
167159
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
@@ -175,18 +167,18 @@ require (
175167
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
176168
go.uber.org/multierr v1.11.0 // indirect
177169
go.uber.org/zap v1.25.0 // indirect
178-
golang.org/x/crypto v0.13.0 // indirect
170+
golang.org/x/crypto v0.14.0 // indirect
179171
golang.org/x/mod v0.12.0 // indirect
180172
golang.org/x/oauth2 v0.9.0 // indirect
181173
golang.org/x/sync v0.3.0 // indirect
182-
golang.org/x/sys v0.12.0 // indirect
183-
golang.org/x/term v0.12.0 // indirect
174+
golang.org/x/sys v0.13.0 // indirect
175+
golang.org/x/term v0.13.0 // indirect
184176
golang.org/x/text v0.13.0 // indirect
185177
golang.org/x/time v0.3.0 // indirect
186178
golang.org/x/tools v0.13.0 // indirect
187179
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
188180
google.golang.org/appengine v1.6.7 // indirect
189-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
181+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
190182
gopkg.in/inf.v0 v0.9.1 // indirect
191183
gopkg.in/ini.v1 v1.67.0 // indirect
192184
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -205,7 +197,7 @@ replace (
205197
github.com/hashicorp/terraform-exec v0.16.1 => github.com/tf-controller/terraform-exec v0.15.1-0.20220809152546-4850a69faedb
206198

207199
// Fix CVE-2023-32731
208-
google.golang.org/grpc => google.golang.org/grpc v1.53.0
200+
google.golang.org/grpc => google.golang.org/grpc v1.56.3
209201

210202
k8s.io/api => k8s.io/api v0.27.4
211203
k8s.io/apimachinery => k8s.io/apimachinery v0.27.4

0 commit comments

Comments
 (0)