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

[management,client] Default to NetBird's upload service when nothing is configured

Browse Source 
The previous commit made a peer with no destination — no MDM override, no URL
named by the caller, nothing published by its management server — refuse to
upload and keep the bundle local unless it was enrolled with NetBird's cloud.
That closed the reported data-boundary concern, but it broke the default for
everyone who uploads a bundle as part of their day: a self-hosted user opening
a support ticket got a refusal where the command used to work.

Product decision (NetBird's, not the reporter's): the knob to keep bundles
inside your own infrastructure is what this branch provides, and it is enough.
The default stays the service NetBird runs, self-hosted included. An admin who
needs the bundles to stay in-house configures the destination; until then the
everyday flow keeps working.

So ResolveUploadURL drops the cloud check, the sentinel error and the
managementURL argument, and never fails:

    MDM  >  explicitly named URL  >  published by management  >  NetBird's service

Nothing observable changes for a deployment that configures nothing, which also
removes two edge cases the fail-closed default had: a peer still enrolled on the
legacy api.wiretrustee.com host would have been classified self-hosted and
refused, and an upgrade would have silently stopped uploads for self-hosted
deployments relying on them. The privilege gate is unaffected — a host other
than the default one still requires a privileged caller, so pointing the CLI
somewhere other than what management published needs root.
This commit is contained in:
riccardom
2026-09-10 16:38:41 +02:00
parent fcb9b02451
commit c71fd1d841
16 changed files with 88 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/android/client.go
+5 -11
View File
@@ -349,8 +349,8 @@ func (c *Client) DebugBundle(platformFiles PlatformFiles, anonymize bool, anonym
}
// Empty unless an engine is running and has synced: a bundle generated with
// the client stopped has no management-published destination, so it uploads
// only when the peer is enrolled with NetBird's cloud.
// the client stopped has no management-published destination and goes to the
// service NetBird runs.
var publishedUploadURL string
if cc != nil {
@@ -380,15 +380,9 @@ func (c *Client) DebugBundle(platformFiles PlatformFiles, anonymize bool, anonym
},
)
// Resolved before the bundle is generated: with no destination there is
// nothing to hand back to the app, and generating (then deleting) a bundle
// nobody can collect is wasted work on the device. An MDM override wins;
// otherwise the destination this deployment publishes is used, and only a
// peer enrolled with NetBird's cloud falls back to the service NetBird runs.
uploadURL, err := debug.ResolveUploadURL(cfg.DebugBundleUploadURL, publishedUploadURL, cfg.ManagementURL.String())
if err != nil {
return "", err
}
// An MDM override wins; otherwise the destination this deployment publishes
// is used, and failing that the service NetBird runs.
uploadURL := debug.ResolveUploadURL(cfg.DebugBundleUploadURL, publishedUploadURL)
path, err := bundleGenerator.Generate()
if err != nil {