mirror of
https://github.com/netbirdio/netbird.git
synced 2026-09-27 00:59:07 +02:00
[client] Return innermost gRPC status from WaitExtendAuthSession
The daemon wrapped the management ExtendAuthSession error through two %v/%w layers and remapped it to codes.Internal, so the UI surfaced the full wrapped chain instead of the root cause. Forward only the innermost gRPC status (original code + clean desc) to the client and log the full chain. gstatus.FromError does not unwrap, so add innermostStatus to walk the %w chain.
This commit is contained in:
+21
-1
@@ -1771,7 +1771,14 @@ func (s *Server) WaitExtendAuthSession(
|
||||
|
||||
deadline, err := engine.ExtendAuthSession(ctx, tokenInfo.GetTokenToUse())
|
||||
if err != nil {
|
||||
return nil, gstatus.Errorf(codes.Internal, "management ExtendAuthSession failed: %v", err)
|
||||
// Log the full wrapped chain, but return only the innermost gRPC
|
||||
// status (code + clean desc) so the UI shows the root cause, not
|
||||
// the daemon's wrapping layers.
|
||||
log.Errorf("management ExtendAuthSession failed: %v", err)
|
||||
if st := innermostStatus(err); st != nil {
|
||||
return nil, gstatus.Error(st.Code(), st.Message())
|
||||
}
|
||||
return nil, gstatus.Errorf(codes.Internal, "%v", err)
|
||||
}
|
||||
|
||||
resp := &proto.WaitExtendAuthSessionResponse{}
|
||||
@@ -2392,3 +2399,16 @@ func logoutPeerGone(err error) bool {
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// innermostStatus walks the wrap chain and returns the deepest gRPC status,
|
||||
// or nil when none is present. gstatus.FromError does not unwrap, so a status
|
||||
// wrapped with fmt.Errorf %w would otherwise be missed.
|
||||
func innermostStatus(err error) *gstatus.Status {
|
||||
var found *gstatus.Status
|
||||
for e := err; e != nil; e = errors.Unwrap(e) {
|
||||
if s, ok := gstatus.FromError(e); ok {
|
||||
found = s
|
||||
}
|
||||
}
|
||||
return found
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user