From e640c6df05d6cde2d484314a89359f33f2124c48 Mon Sep 17 00:00:00 2001
From: Juan Font Alonso <juanfontalonso@gmail.com>
Date: Sun, 14 Aug 2022 21:10:08 +0200
Subject: [PATCH] Fixes in Noise poll (clients should work now)
---
noise_api.go | 3 ++-
noise_poll.go | 56 +++++++++++++++++++++++++++++++++------------------
2 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/noise_api.go b/noise_api.go
index 6bf555e6..98a66d22 100644
--- a/noise_api.go
+++ b/noise_api.go
@@ -369,8 +369,9 @@ func (h *Headscale) handleNoiseMachineRegistrationNew(
// The machine registration is new, redirect the client to the registration URL
log.Debug().
+ Caller().
Str("machine", registerRequest.Hostinfo.Hostname).
- Msg("The node is sending us a new NodeKey, sending auth url")
+ Msg("The node seems to be new, sending auth url")
if h.cfg.OIDC.Issuer != "" {
resp.AuthURL = fmt.Sprintf(
"%s/oidc/register/%s",
diff --git a/noise_poll.go b/noise_poll.go
index 1489fff0..1d9dfe37 100644
--- a/noise_poll.go
+++ b/noise_poll.go
@@ -298,10 +298,19 @@ func (h *Headscale) NoisePollNetMapStream(
Err(err).
Msg("Cannot write data")
- break
+ return
}
- if f, ok := writer.(http.Flusher); ok {
- f.Flush()
+
+ flusher, ok := writer.(http.Flusher)
+ if !ok {
+ log.Error().
+ Caller().
+ Str("handler", "PollNetMapStream").
+ Str("machine", machine.Hostname).
+ Str("channel", "pollData").
+ Msg("Cannot cast writer to http.Flusher")
+ } else {
+ flusher.Flush()
}
log.Trace().
Str("handler", "NoisePollNetMapStream").
@@ -323,7 +332,7 @@ func (h *Headscale) NoisePollNetMapStream(
// client has been removed from database
// since the stream opened, terminate connection.
- break
+ return
}
now := time.Now().UTC()
machine.LastSeen = &now
@@ -353,27 +362,34 @@ func (h *Headscale) NoisePollNetMapStream(
case data := <-keepAliveChan:
log.Trace().
- Str("handler", "NoisePollNetMapStream").
+ Str("handler", "PollNetMapStream").
Str("machine", machine.Hostname).
Str("channel", "keepAlive").
Int("bytes", len(data)).
Msg("Sending keep alive message")
-
_, err := writer.Write(data)
- if f, ok := writer.(http.Flusher); ok {
- f.Flush()
- }
-
if err != nil {
log.Error().
- Str("handler", "NoisePollNetMapStream").
+ Str("handler", "PollNetMapStream").
Str("machine", machine.Hostname).
Str("channel", "keepAlive").
Err(err).
Msg("Cannot write keep alive message")
- break
+ return
}
+ flusher, ok := writer.(http.Flusher)
+ if !ok {
+ log.Error().
+ Caller().
+ Str("handler", "PollNetMapStream").
+ Str("machine", machine.Hostname).
+ Str("channel", "keepAlive").
+ Msg("Cannot cast writer to http.Flusher")
+ } else {
+ flusher.Flush()
+ }
+
log.Trace().
Str("handler", "NoisePollNetMapStream").
Str("machine", machine.Hostname).
@@ -394,7 +410,7 @@ func (h *Headscale) NoisePollNetMapStream(
// client has been removed from database
// since the stream opened, terminate connection.
- break
+ return
}
now := time.Now().UTC()
machine.LastSeen = &now
@@ -415,7 +431,7 @@ func (h *Headscale) NoisePollNetMapStream(
Msg("Machine updated successfully after sending keep alive")
}
- break
+ return
case <-updateChan:
log.Trace().
@@ -456,7 +472,7 @@ func (h *Headscale) NoisePollNetMapStream(
updateRequestsSentToNode.WithLabelValues(machine.Namespace.Name, machine.Hostname, "failed").
Inc()
- break
+ return
}
if f, ok := writer.(http.Flusher); ok {
@@ -489,7 +505,7 @@ func (h *Headscale) NoisePollNetMapStream(
// client has been removed from database
// since the stream opened, terminate connection.
- break
+ return
}
now := time.Now().UTC()
@@ -519,7 +535,7 @@ func (h *Headscale) NoisePollNetMapStream(
Msgf("%s is up to date", machine.Hostname)
}
- break
+ return
case <-ctx.Done():
log.Info().
@@ -540,7 +556,7 @@ func (h *Headscale) NoisePollNetMapStream(
// client has been removed from database
// since the stream opened, terminate connection.
- break
+ return
}
now := time.Now().UTC()
machine.LastSeen = &now
@@ -554,7 +570,7 @@ func (h *Headscale) NoisePollNetMapStream(
Msg("Cannot update machine LastSeen")
}
- break
+ return
}
}
}
@@ -606,7 +622,7 @@ func (h *Headscale) noiseScheduledPollWorker(
log.Debug().
Str("func", "scheduledPollWorker").
Str("machine", machine.Hostname).
- Msg("Sending update request")
+ Msg("Sending noise update request")
updateRequestsFromNode.WithLabelValues(machine.Namespace.Name, machine.Hostname, "scheduled-update").
Inc()
updateChan <- struct{}{}