Skip to content

OCPBUGS-79905: Bump google.golang.org/grpc #398

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

Open
sbiradar10 wants to merge 1 commit into
base: release-4.15
Choose a base branch
from
+37 −3
Open

OCPBUGS-79905: Bump google.golang.org/grpc #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion pkg/csi/cinder/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ import (
"k8s.io/klog/v2"

"github.com/container-storage-interface/spec/lib/go/csi"

"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"context"
)

// NonBlockingGRPCServer defines Non blocking GRPC server interfaces
Expand Down Expand Up @@ -87,8 +91,16 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, c
klog.Fatalf("Failed to listen: %v", err)
}

// Mitigation for CVE-2026-33186 in grpc according to https://github.com/grpc/grpc-go/security/advisories/GHSA-p77j-4mvh-x3m3
pathValidationInterceptor := func (ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
if info.FullMethod == "" || info.FullMethod[0] != '/' {
return nil, status.Errorf(codes.Unimplemented, "malformed method name")
}
return handler(ctx, req)
}

opts := []grpc.ServerOption{
grpc.UnaryInterceptor(logGRPC),
grpc.ChainUnaryInterceptor(pathValidationInterceptor, logGRPC),
}
server := grpc.NewServer(opts...)
s.server = server
Expand Down
13 changes: 12 additions & 1 deletion pkg/csi/manila/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ import (
"k8s.io/cloud-provider-openstack/pkg/csi/manila/manilaclient"
"k8s.io/cloud-provider-openstack/pkg/version"
"k8s.io/klog/v2"

"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)

type DriverOpts struct {
Expand Down Expand Up @@ -320,7 +323,15 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids *identityServer, cs *
klog.Fatalf("listen failed for GRPC server: %v", err)
}

server := grpc.NewServer(grpc.UnaryInterceptor(func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
// Mitigation for CVE-2026-33186 in grpc according to https://github.com/grpc/grpc-go/security/advisories/GHSA-p77j-4mvh-x3m3
pathValidationInterceptor := func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
if info.FullMethod == "" || info.FullMethod[0] != '/' {
return nil, status.Errorf(codes.Unimplemented, "malformed method name")
}
return handler(ctx, req)
}

server := grpc.NewServer(grpc.ChainUnaryInterceptor(pathValidationInterceptor, func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
callID := atomic.AddUint64(&serverGRPCEndpointCallCounter, 1)

klog.V(3).Infof("[ID:%d] GRPC call: %s", callID, info.FullMethod)
Expand Down
13 changes: 12 additions & 1 deletion pkg/kms/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import (
"k8s.io/cloud-provider-openstack/pkg/kms/encryption/aescbc"
"k8s.io/klog/v2"
pb "k8s.io/kms/apis/v2"

"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)

const (
Expand Down Expand Up @@ -72,7 +75,15 @@ func Run(configFilePath string, socketpath string, sigchan <-chan os.Signal) (er
return err
}

gServer := grpc.NewServer()
// Mitigation for CVE-2026-33186 in grpc according to https://github.com/grpc/grpc-go/security/advisories/GHSA-p77j-4mvh-x3m3
pathValidationInterceptor := func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
if info.FullMethod == "" || info.FullMethod[0] != '/' {
return nil, status.Errorf(codes.Unimplemented, "malformed method name")
}
return handler(ctx, req)
}

gServer := grpc.NewServer(grpc.UnaryInterceptor(pathValidationInterceptor))
pb.RegisterKeyManagementServiceServer(gServer, s)

serverCh := make(chan error, 1)
Expand Down