Skip to content

Address vulnerabilities in Mettle repo #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toastwaffle merged 12 commits into from
Apr 30, 2026
Merged

Address vulnerabilities in Mettle repo #351

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a060faf
run go mod tidy
scyyx5 Apr 23, 2026
dd80c82
Bump github.com/golang/glog from 1.2.0 to 1.2.4
dependabot[bot] Apr 22, 2026
ef73274
Bump golang.org/x/crypto from 0.17.0 to 0.45.0
dependabot[bot] Apr 22, 2026
f03e98c
fix merge conflict
dependabot[bot] Apr 22, 2026
db65686
Bump golang.org/x/oauth2 from 0.15.0 to 0.27.0
dependabot[bot] Apr 22, 2026
a820249
Bump github.com/hashicorp/go-retryablehttp from 0.7.5 to 0.7.7
dependabot[bot] Apr 22, 2026
c9044cd
Bump google.golang.org/grpc from 1.60.1 to 1.79.3
dependabot[bot] Apr 22, 2026
b07a051
resolve build failure for golangci-lint / lint
scyyx5 Apr 24, 2026
73b8641
Update third_party/go/BUILD via puku sync
scyyx5 Apr 28, 2026
35fda39
add back Check() and Watch()
scyyx5 Apr 28, 2026
1a934ef
Update Go version to 1.24.0 and remove unimplemented Watch method
scyyx5 Apr 28, 2026
540c648
Add comment on healthServer struct
scyyx5 Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions flair/rpc/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ func ServeForever(opts grpcutil.Opts, casReplicator, assetReplicator, executorRe
bytestreamRe: regexp.MustCompile("(?:uploads/[0-9a-f-]+/)?(blobs|compressed-blobs/zstd)/([0-9a-f]+)/([0-9]+)"),
timeout: timeout,
}
healthSrv := &healthServer{
replicator: casReplicator,
assetReplicator: assetReplicator,
exeReplicator: executorReplicator,
}
opts.NoHealth = true // We will do this ourselves.
lis, s := grpcutil.NewServer(opts)
pb.RegisterCapabilitiesServer(s, srv)
Expand All @@ -62,7 +67,7 @@ func ServeForever(opts grpcutil.Opts, casReplicator, assetReplicator, executorRe
pb.RegisterExecutionServer(s, srv)
}
ppb.RegisterGCServer(s, srv)
hpb.RegisterHealthServer(s, srv)
hpb.RegisterHealthServer(s, healthSrv)
grpcutil.ServeForever(lis, s)
}

Expand All @@ -73,7 +78,12 @@ type server struct {
timeout time.Duration
}

func (s *server) Check(context.Context, *hpb.HealthCheckRequest) (*hpb.HealthCheckResponse, error) {
Comment thread
scyyx5 marked this conversation as resolved.
type healthServer struct {
Comment thread
scyyx5 marked this conversation as resolved.
hpb.UnimplementedHealthServer
replicator, assetReplicator, exeReplicator *trie.Replicator
}

func (s *healthServer) Check(context.Context, *hpb.HealthCheckRequest) (*hpb.HealthCheckResponse, error) {
for _, r := range []*trie.Replicator{s.replicator, s.assetReplicator, s.exeReplicator} {
if r != nil {
if err := r.Healthcheck(); err != nil {
Expand All @@ -86,7 +96,7 @@ func (s *server) Check(context.Context, *hpb.HealthCheckRequest) (*hpb.HealthChe
return &hpb.HealthCheckResponse{Status: hpb.HealthCheckResponse_SERVING}, nil
}

func (s *server) Watch(*hpb.HealthCheckRequest, hpb.Health_WatchServer) error {
func (s *healthServer) Watch(*hpb.HealthCheckRequest, hpb.Health_WatchServer) error {
Comment thread
scyyx5 marked this conversation as resolved.
Outdated
return status.Errorf(codes.Unimplemented, "grpc_health_v1.Watch not implemented")
}

Expand Down
51 changes: 24 additions & 27 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/thought-machine/please-servers

go 1.22
go 1.24.0

require (
cloud.google.com/go/profiler v0.4.0
Expand All @@ -11,13 +11,11 @@ require (
github.com/dgraph-io/ristretto v0.1.1
github.com/dustin/go-humanize v1.0.1
github.com/go-redis/redis/v8 v8.11.5
github.com/golang/protobuf v1.5.3
github.com/golang/snappy v0.0.4 // This is a required dep that Go mod tidy gets rid of. This breaks Please if it gets removed though.
github.com/google/go-cmp v0.6.0 // This is a required dep that Go mod tidy gets rid of. This breaks Please if it gets removed though.
github.com/golang/protobuf v1.5.4
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-retryablehttp v0.7.5
github.com/hashicorp/go-retryablehttp v0.7.7
github.com/klauspost/compress v1.17.4
github.com/mostynb/go-grpc-compression v1.2.2
github.com/peterebden/go-cli-init/v4 v4.0.2
Expand All @@ -27,42 +25,41 @@ require (
github.com/prometheus/common v0.45.0
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.11.1
github.com/thought-machine/http-admin v1.1.1
go.uber.org/automaxprocs v1.5.3
gocloud.dev v0.36.0
golang.org/x/crypto v0.17.0
golang.org/x/crypto v0.46.0
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
golang.org/x/sync v0.6.0
golang.org/x/sync v0.19.0
golang.org/x/time v0.5.0
google.golang.org/api v0.155.0
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240102182953-50ed04b92917
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.33.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217
google.golang.org/grpc v1.79.3
google.golang.org/protobuf v1.36.10
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
)

require (
cloud.google.com/go v0.111.0 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/longrunning v0.5.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/golang/glog v1.2.5 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/google/wire v0.5.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
Expand All @@ -80,19 +77,19 @@ require (
github.com/thought-machine/go-flags v1.6.3 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sys v0.39.0 // indirect
golang.org/x/term v0.38.0 // indirect
golang.org/x/text v0.32.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
Loading
Loading