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

[management,client] Carry the debug upload destination on PeerConfig

Browse Source 
A destination set from the dashboard never reached a connected peer. The peer
fan-out that follows a settings change builds its sync with a nil server config,
and toNetbirdConfig returns nil for that, so no NetbirdConfig went out at all and
the peer kept whatever it had. The new URL only arrived when the peer
reconnected, and until then its bundles kept going to NetBird's upload service —
which is the disclosure this PR exists to close.

PeerConfig is the message the fan-out already fills from the account settings,
alongside the other knobs an operator flips at runtime: lazy connection, MTU,
routing-peer DNS resolution, auto-update. The destination belongs with them.
Sending a partial NetbirdConfig from the fan-out instead would be worse: clients
treat a non-nil one as authoritative for relay and would drop their relay URLs.

Start now reads the destination off the PeerConfig it was given in the previous
commit, for the same reason it used to read it off NetbirdConfig: without it, a
bundle collected between login and the first sync sees no destination, and the
first seconds after a start are exactly when someone collects a bundle about a
start that went wrong.

DebugConfig is removed rather than deprecated. It was added earlier in this
branch and has never been in a release, so no deployed client reads it.
This commit is contained in:
riccardom
2026-10-09 11:06:29 +02:00
parent 6ea208eb05
commit cac6cba096
8 changed files with 1384 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/internal/engine_bundle_test.go
+7 -8
View File
@@ -47,18 +47,17 @@ func TestEngineDebugUploadURL(t *testing.T) {
e.handleDebugUploadUpdate(nil)
assert.Empty(t, e.DebugUploadURL(), "a management server predating the field publishes none")
e.handleDebugUploadUpdate(&mgmProto.DebugConfig{UploadUrl: "https://upload.example.com/upload-url"})
e.handleDebugUploadUpdate(&mgmProto.PeerConfig{DebugBundleUploadUrl: "https://upload.example.com/upload-url"})
assert.Equal(t, "https://upload.example.com/upload-url", e.DebugUploadURL())
// The partial updates that refresh TURN and relay credentials carry a
// NetbirdConfig with no Debug at all. Treating that as "no destination"
// would drop the operator's choice on every credential refresh.
// A partial update ships a SyncResponse with no PeerConfig at all. Treating
// that as "no destination" would drop the operator's choice.
e.handleDebugUploadUpdate(nil)
assert.Equal(t, "https://upload.example.com/upload-url", e.DebugUploadURL(),
"a partial config update must not clear the published destination")
"a partial update must not clear the published destination")
// An operator that removes the destination sends an empty UploadUrl on a
// full config, and that does reach the peer.
e.handleDebugUploadUpdate(&mgmProto.DebugConfig{})
// An operator that removes the destination sends a PeerConfig with an empty
// URL, and that does reach the peer.
e.handleDebugUploadUpdate(&mgmProto.PeerConfig{})
assert.Empty(t, e.DebugUploadURL())
}