Skip to content

fix: grpc payload deserialization should only happen for requested fields #39

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

Closed
kushsharma wants to merge 1 commit into from
Closed

fix: grpc payload deserialization should only happen for requested fields #39

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
33 changes: 18 additions & 15 deletions middleware/grpc_payload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package middleware
import (
"bytes"
"encoding/binary"
"errors"
"fmt"
"io"
"io/ioutil"
"net/http"

"github.com/pkg/errors"

"github.com/golang/protobuf/protoc-gen-go/descriptor"
"github.com/jhump/protoreflect/desc"
"github.com/jhump/protoreflect/desc/builder"
Expand Down Expand Up @@ -106,9 +107,9 @@ func (p *grpcRequestParser) Parse() (pf GRPCPayloadCompressionFormat, msg []byte
}

func fieldFromProtoMessage(msg []byte, tagIndex int) (string, error) {
desc, err := buildPayloadGenericProto()
desc, err := buildPayloadGenericProto(tagIndex)
if err != nil {
return "", err
return "", errors.Wrap(err, "failed to build generic proto")
}

// populate message
Expand All @@ -123,23 +124,25 @@ func fieldFromProtoMessage(msg []byte, tagIndex int) (string, error) {
return val.(string), nil
}

// should only be built once
var genericProtoCache *desc.MessageDescriptor
// should only be built once for one index
var genericProtoCache = make(map[int]*desc.MessageDescriptor)

func buildPayloadGenericProto() (*desc.MessageDescriptor, error) {
if genericProtoCache != nil {
return genericProtoCache, nil
// currently we build a generic message with just one field of string type
// should be able to support more primitive types if needed
func buildPayloadGenericProto(idx int) (*desc.MessageDescriptor, error) {
if val, ok := genericProtoCache[idx]; ok {
return val, nil
}

builderMsg := builder.NewMessage("message")
for i := 1; i < 100; i++ {
builderMsg := builder.NewMessage("message")
builderMsg.AddField(builder.NewField(fmt.Sprintf("field_%d", i),
builder.FieldTypeScalar(descriptor.FieldDescriptorProto_TYPE_STRING)).SetNumber(int32(i)))
desc, err := builderMsg.Build()
if err != nil {
return nil, err
}
genericProtoCache[i] = desc
}
desc, err := builderMsg.Build()
if err != nil {
return nil, err
}
genericProtoCache = desc
return genericProtoCache, nil
return genericProtoCache[idx], nil
}