sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-20 21:59:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restores context MD passed to GetInfo to mgmt (is it valuable data?)

Browse Source
This commit is contained in:
riccardom
2026-06-16 18:55:08 +02:00
parent 9758145517
commit d1229ed84c
6 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/server/server.go
+7 -3
View File
@@ -285,8 +285,12 @@ func (s *Server) connectWithRetryRuns(ctx context.Context, client *internal.Conn
}
}()
// Forward any gRPC metadata the RPC caller attached (e.g. the UI
// user-agent in Up); nil for boot/MDM paths that have no incoming call.
md, _ := metadata.FromOutgoingContext(ctx)
runOperation := func() error {
err := s.connectOnce(client, profileConfig, runningChan)
err := s.connectOnce(client, profileConfig, md, runningChan)
if err != nil {
log.Debugf("will retry the connection in the background")
return err
@@ -1737,9 +1741,9 @@ func (s *Server) GetFeatures(ctx context.Context, msg *proto.GetFeaturesRequest)
// connectOnce performs a single client run (Run blocks, retrying its own
// internal backoff, until the run ends). The outer connectWithRetryRuns
// backoff re-invokes it only when a run returns an error.
func (s *Server) connectOnce(client *internal.ConnectClient, config *profilemanager.Config, runningChan chan struct{}) error {
func (s *Server) connectOnce(client *internal.ConnectClient, config *profilemanager.Config, md metadata.MD, runningChan chan struct{}) error {
log.Tracef("running client connection")
if err := client.Run(config, runningChan, s.logFile); err != nil {
if err := client.Run(config, md, runningChan, s.logFile); err != nil {
log.Debugf("run client connection exited with error: %v", err)
return err
}