From 2ac6d9f66bd9a96e06f0f3f0862da7563531b01a Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Thu, 8 Feb 2018 16:15:37 -0800 Subject: [PATCH 1/2] plugin/gRPC: fix panic when special paths are not set --- logical/plugin/grpc_backend_client.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/logical/plugin/grpc_backend_client.go b/logical/plugin/grpc_backend_client.go index 8e584d778d3f..862ffd893ad5 100644 --- a/logical/plugin/grpc_backend_client.go +++ b/logical/plugin/grpc_backend_client.go @@ -79,6 +79,10 @@ func (b *backendGRPCPluginClient) SpecialPaths() *logical.Paths { return nil } + if reply.Paths == nil { + return nil + } + return &logical.Paths{ Root: reply.Paths.Root, Unauthenticated: reply.Paths.Unauthenticated, From 2fd488e7e5192876ffd49aa54fbdd16cc491f499 Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Thu, 8 Feb 2018 16:16:55 -0800 Subject: [PATCH 2/2] Remove comment --- logical/plugin/grpc_backend_client.go | 1 - 1 file changed, 1 deletion(-) diff --git a/logical/plugin/grpc_backend_client.go b/logical/plugin/grpc_backend_client.go index 862ffd893ad5..7df90837d1c3 100644 --- a/logical/plugin/grpc_backend_client.go +++ b/logical/plugin/grpc_backend_client.go @@ -73,7 +73,6 @@ func (b *backendGRPCPluginClient) HandleRequest(ctx context.Context, req *logica } func (b *backendGRPCPluginClient) SpecialPaths() *logical.Paths { - // Timeout the connection reply, err := b.client.SpecialPaths(b.doneCtx, &pb.Empty{}) if err != nil { return nil