Skip to content

Revert "try workaround for grpc vulnerability" #997

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
lt616 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "try workaround for grpc vulnerability" #997

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
21 changes: 1 addition & 20 deletions src/go/configmanager/main/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,11 @@ import (
"github.com/GoogleCloudPlatform/esp-v2/src/go/tokengenerator"
"github.com/golang/glog"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

discoverygrpc "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
xds "github.com/envoyproxy/go-control-plane/pkg/server/v3"
)

func pathValidationUnaryInterceptor(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)
}

func pathValidationStreamInterceptor(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
if info.FullMethod == "" || info.FullMethod[0] != '/' {
return status.Errorf(codes.Unimplemented, "malformed method name")
}
return handler(srv, ss)
}

func main() {
flag.Parse()
opts := flags.EnvoyConfigOptionsFromFlags()
Expand All @@ -70,10 +54,7 @@ func main() {
glog.Exitf("fail to initialize config manager: %v", err)
}
server := xds.NewServer(ctx, m.Cache(), nil)
grpcServer := grpc.NewServer(
grpc.UnaryInterceptor(pathValidationUnaryInterceptor),
grpc.StreamInterceptor(pathValidationStreamInterceptor),
)
grpcServer := grpc.NewServer()
lis, err := net.Listen("unix", opts.AdsNamedPipe)
if err != nil {
glog.Exitf("Server failed to listen: %v", err)
Expand Down
Loading