sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-24 14:29:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

[client] Surface session deadline rejections via SystemEvent and add timer arm debug logs

Browse Source 
When sessionwatch.Watcher.Update rejects a deadline (pre-epoch, too far
in the future, or past the clock-skew tolerance) it silently zeroes the
status recorder, leaving the UI with no "expires in" row and no
indication of why. Publish a SystemEvent_ERROR on the AUTHENTICATION
channel so the rejection appears in the UI event feed and the user
knows re-login may be required.

Also add Debugf log lines in armTimerLocked so that warning and
final-warning timer fire-times are visible in logs without having to
add instrumentation after the fact.

https://claude.ai/code/session_01Y3bQoNgcVjTD4zDTvv7a8u
This commit is contained in:
Claude
2026-06-07 19:55:56 +00:00
parent 21f1142355
commit c0b00eed46
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/internal/auth/sessionwatch/watcher.go
+6 -2
View File
@@ -287,12 +287,16 @@ func (w *Watcher) stopTimerLocked() {
} }
func (w *Watcher) armTimerLocked(deadline time.Time) { func (w *Watcher) armTimerLocked(deadline time.Time) {
w.timer = armOneShotLocked(deadline.Add(-w.lead), func() { w.fire(deadline) }) fireAt := deadline.Add(-w.lead)
log.Debugf("sessionwatch: arming warning timer at %s (in %s)", fireAt.Format(time.RFC3339), time.Until(fireAt).Round(time.Second))
w.timer = armOneShotLocked(fireAt, func() { w.fire(deadline) })
// finalLead <= 0 disables the final-warning timer entirely. Used by // finalLead <= 0 disables the final-warning timer entirely. Used by
// tests that predate the final-warning fallback so a millisecond-scale // tests that predate the final-warning fallback so a millisecond-scale
// deadline does not flush both timers at once. // deadline does not flush both timers at once.
if w.finalLead > 0 { if w.finalLead > 0 {
w.finalTimer = armOneShotLocked(deadline.Add(-w.finalLead), func() { w.fireFinal(deadline) }) finalFireAt := deadline.Add(-w.finalLead)
log.Debugf("sessionwatch: arming final-warning timer at %s (in %s)", finalFireAt.Format(time.RFC3339), time.Until(finalFireAt).Round(time.Second))
w.finalTimer = armOneShotLocked(finalFireAt, func() { w.fireFinal(deadline) })
} }
} }
client/internal/engine_authsession.go
+8
View File
@@ -9,6 +9,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
cProto "github.com/netbirdio/netbird/client/proto"
"github.com/netbirdio/netbird/client/system" "github.com/netbirdio/netbird/client/system"
) )
@@ -51,6 +52,13 @@ func (e *Engine) ApplySessionDeadline(ts *timestamppb.Timestamp) {
// of sync with the warning timers. // of sync with the warning timers.
if err := e.sessionWatcher.Update(deadline); err != nil { if err := e.sessionWatcher.Update(deadline); err != nil {
log.Errorf("auth session deadline rejected: %v, clearing", err) log.Errorf("auth session deadline rejected: %v, clearing", err)
e.statusRecorder.PublishEvent(
cProto.SystemEvent_ERROR,
cProto.SystemEvent_AUTHENTICATION,
"session deadline rejected",
"The session expiry time from the server could not be applied. Re-login may be required.",
map[string]string{"reason": err.Error()},
)
} }
} }