Skip to content

fix: 🐛 prevent reflection headers to be stored on the server #43

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

fix: 🐛 prevent reflection headers to be stored on the server #43

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
21 changes: 13 additions & 8 deletions core/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ type Resource struct {
md metadata.MD
}

//openDescriptor - use it to reflect server descriptor
func (r *Resource) openDescriptor() error {
// openDescriptor - use it to reflect server descriptor
func (r *Resource) openDescriptor(reflectHeaders []string) error {
ctx := context.Background()
refCtx := metadata.NewOutgoingContext(ctx, r.md)
outgoingMD := r.md.Copy()
md := grpcurl.MetadataFromHeaders(reflectHeaders)
for k, v := range md {
outgoingMD.Append(k, v...)
}
refCtx := metadata.NewOutgoingContext(ctx, outgoingMD)
r.refClient = grpcreflect.NewClient(refCtx, reflectpb.NewServerReflectionClient(r.clientConn))

// if no protos available use server reflection
Expand Down Expand Up @@ -73,7 +78,7 @@ func (r *Resource) openDescriptor() error {
return err
}

//closeDescriptor - please ensure to always close after open in the same flow
// closeDescriptor - please ensure to always close after open in the same flow
func (r *Resource) closeDescriptor() {
done := make(chan int)
go func() {
Expand All @@ -95,8 +100,8 @@ func (r *Resource) closeDescriptor() {
// List - To list all services exposed by a server
// symbol can be "" to list all available services
// symbol also can be service name to list all available method
func (r *Resource) List(symbol string) ([]string, error) {
err := r.openDescriptor()
func (r *Resource) List(symbol string, reflectHeaders []string) ([]string, error) {
err := r.openDescriptor(reflectHeaders)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -137,7 +142,7 @@ func (r *Resource) List(symbol string) ([]string, error) {
// It also prints a description of that symbol, in the form of snippets of proto source.
// It won't necessarily be the original source that defined the element, but it will be equivalent.
func (r *Resource) Describe(symbol string) (string, string, error) {
err := r.openDescriptor()
err := r.openDescriptor(nil)
if err != nil {
return "", "", err
}
Expand Down Expand Up @@ -196,7 +201,7 @@ func (r *Resource) Describe(symbol string) (string, string, error) {

// Invoke - invoking gRPC function
func (r *Resource) Invoke(ctx context.Context, metadata []string, symbol string, in io.Reader) (string, time.Duration, error) {
err := r.openDescriptor()
err := r.openDescriptor(nil)
if err != nil {
return "", 0, err
}
Expand Down
6 changes: 2 additions & 4 deletions handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,13 @@ func (h *Handler) getLists(w http.ResponseWriter, r *http.Request) {
metadataStr = fmt.Sprintf("%s:", m)
}

h.g.SetReflectHeaders(metadata...)

res, err := h.g.GetResource(context.Background(), host, !useTLS, restart)
if err != nil {
writeError(w, err)
return
}

result, err := res.List(service)
result, err := res.List(service, metadata)
if err != nil {
writeError(w, err)
return
Expand Down Expand Up @@ -155,7 +153,7 @@ func (h *Handler) getListsWithProto(w http.ResponseWriter, r *http.Request) {
return
}

result, err := res.List(service)
result, err := res.List(service, nil)
if err != nil {
writeError(w, err)
return
Expand Down