grpcproxy: use metadata instead of context withvalue in with client auth token

krijohs · krijohs · commit b65c4a6d4316 · 2024-12-09T16:32:29.000+01:00
Signed-off-by: Kristoffer Johansson &lt;kristoffer.johansson@gcore.com&gt;
diff --git a/server/proxy/grpcproxy/util.go b/server/proxy/grpcproxy/util.go
@@ -37,7 +37,8 @@ func getAuthTokenFromClient(ctx context.Context) string {
 func withClientAuthToken(ctx, ctxWithToken context.Context) context.Context {
 	token := getAuthTokenFromClient(ctxWithToken)
 	if token != "" {
-		ctx = context.WithValue(ctx, rpctypes.TokenFieldNameGRPCKey{}, token)
+		md := metadata.Pairs(rpctypes.TokenFieldNameGRPC, token)
+		return metadata.NewOutgoingContext(ctx, md)
 	}
 	return ctx
 }
diff --git a/server/proxy/grpcproxy/watch_broadcasts.go b/server/proxy/grpcproxy/watch_broadcasts.go
@@ -70,6 +70,7 @@ func (wbs *watchBroadcasts) coalesce(wb *watchBroadcast) {
 				wbs.watchers[w] = wbswb
 			}
 			wb.receivers = nil
+			watchersCoalescing.Inc()
 		}
 		wbswb.mu.Unlock()
 		wb.mu.Unlock()

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ func getAuthTokenFromClient(ctx context.Context) string {`
`37`	`37`	`func withClientAuthToken(ctx, ctxWithToken context.Context) context.Context {`
`38`	`38`	`token := getAuthTokenFromClient(ctxWithToken)`
`39`	`39`	`if token != "" {`
`40`		`- ctx = context.WithValue(ctx, rpctypes.TokenFieldNameGRPCKey{}, token)`
	`40`	`+ md := metadata.Pairs(rpctypes.TokenFieldNameGRPC, token)`
	`41`	`+ return metadata.NewOutgoingContext(ctx, md)`
`41`	`42`	`}`
`42`	`43`	`return ctx`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ func (wbs watchBroadcasts) coalesce(wb watchBroadcast) {`
`70`	`70`	`wbs.watchers[w] = wbswb`
`71`	`71`	`}`
`72`	`72`	`wb.receivers = nil`
	`73`	`+ watchersCoalescing.Inc()`
`73`	`74`	`}`
`74`	`75`	`wbswb.mu.Unlock()`
`75`	`76`	`wb.mu.Unlock()`