Skip to content

Commit ebe402a

Browse files
committed
Upgrade github.com/mostynb/go-grpc-compression to avoid decompression bomb DoS
mostynb/go-grpc-compression#27
1 parent 400101a commit ebe402a

File tree

9 files changed

+2384
-117
lines changed

9 files changed

+2384
-117
lines changed

.bazelci/buildkite-install-go.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
set -euo pipefail
44

5-
wget -o $HOME/go1.16.7.linux-amd64.tar.gz https://golang.org/dl/go1.16.7.linux-amd64.tar.gz 1>&2
6-
tar -xv -C $HOME -f go1.16.7.linux-amd64.tar.gz 1>&2
5+
wget -o $HOME/go1.22.4.linux-amd64.tar.gz https://golang.org/dl/go1.22.4.linux-amd64.tar.gz 1>&2
6+
tar -xv -C $HOME -f go1.22.4.linux-amd64.tar.gz 1>&2

.bazelci/presubmit.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,35 @@ buildifier:
66
tasks:
77
ubuntu1604:
88
platform: ubuntu1604
9+
bazel: 4.2.2
910
build_targets:
1011
- "..."
1112
test_targets:
1213
- "..."
1314
ubuntu1804:
1415
platform: ubuntu1804
16+
bazel: 4.2.2
1517
build_targets:
1618
- "..."
1719
test_targets:
1820
- "..."
1921
ubuntu2004:
2022
platform: ubuntu2004
23+
bazel: 4.2.2
2124
build_targets:
2225
- "..."
2326
test_targets:
2427
- "..."
25-
macos:
26-
platform: macos
27-
build_targets:
28-
# Skip the (linux) container image targets, just build the binary.
29-
- "//:bazel-remote"
30-
test_targets:
31-
- "..."
28+
# MacOS builds for this old version no longer work on bazelci.
29+
# macos:
30+
# platform: macos
31+
# xcode_version: "13.2.1"
32+
# bazel: 4.2.2
33+
# build_targets:
34+
# # Skip the (linux) container image targets, just build the binary.
35+
# - "//:bazel-remote"
36+
# test_targets:
37+
# - "..."
3238
# A series of checks, each in a separate job due to
3339
# https://github.com/bazelbuild/continuous-integration/issues/938
3440
check_gofmt:

.bazelci/system-test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -e
55
set -u
66
set -o pipefail
77

8+
export USE_BAZEL_VERSION=4.2.2
9+
810
SRC_ROOT=$(dirname "$0")/..
911
SRC_ROOT=$(realpath "$SRC_ROOT")
1012
cd "$SRC_ROOT"
@@ -18,7 +20,7 @@ summary=""
1820

1921
if [ ! -e minio ]
2022
then
21-
wget https://dl.min.io/server/minio/release/linux-amd64/minio
23+
wget -O minio https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2021-12-29T06-49-06Z
2224
chmod +x minio
2325
fi
2426
if [ ! -e mc ]

genproto/build/bazel/remote/execution/v2/remote_execution.pb.go

Lines changed: 55 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
module github.com/buchgr/bazel-remote
22

33
require (
4-
cloud.google.com/go v0.61.0 // indirect
54
github.com/abbot/go-http-auth v0.4.1-0.20181019201920-860ed7f246ff
6-
github.com/bazelbuild/remote-apis v0.0.0-20200708200203-1252343900d9
75
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
86
github.com/djherbis/atime v1.0.0
9-
github.com/golang/protobuf v1.4.2
10-
github.com/google/go-cmp v0.5.0
11-
github.com/google/uuid v1.1.1
7+
github.com/golang/protobuf v1.5.4
8+
github.com/google/go-cmp v0.6.0
9+
github.com/google/uuid v1.6.0
1210
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1311
github.com/klauspost/cpuid v1.3.1 // indirect
1412
github.com/minio/minio-go/v7 v7.0.1
15-
github.com/mostynb/go-grpc-compression v1.1.4
13+
github.com/mostynb/go-grpc-compression v1.2.3
1614
github.com/prometheus/client_golang v1.7.1
1715
github.com/slok/go-http-metrics v0.8.0
1816
github.com/smartystreets/goconvey v1.6.4 // indirect
1917
github.com/urfave/cli/v2 v2.2.0
20-
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
21-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
22-
golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666 // indirect
23-
google.golang.org/genproto v0.0.0-20200722002428-88e341933a54
24-
google.golang.org/grpc v1.31.0
18+
golang.org/x/oauth2 v0.18.0
19+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9
20+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
21+
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240304161311-37d4d3c04a78
22+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237
23+
google.golang.org/grpc v1.64.0
2524
gopkg.in/yaml.v2 v2.3.0
2625
)
2726

0 commit comments

Comments
 (0)