mirror of
https://github.com/netbirdio/netbird.git
synced 2026-09-12 17:59:06 +02:00
riccardom
c71fd1d841
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.
30 lines
1.1 KiB
Go
30 lines
1.1 KiB
Go
package debug
|
|
|
|
import (
|
|
"github.com/netbirdio/netbird/upload-server/types"
|
|
)
|
|
|
|
// ResolveUploadURL decides where a debug bundle is uploaded.
|
|
//
|
|
// requested is a destination a caller named explicitly — an MDM override, the
|
|
// CLI's --upload-bundle-url, a remote job's upload_url; it always wins, and the
|
|
// callers that accept one gate it separately (see requirePrivilegeForUploadURL:
|
|
// any host other than the default needs a privileged caller). published is what
|
|
// the management server of this deployment advertises, which the engine holds
|
|
// (Engine.DebugUploadURL). With neither, the upload service NetBird runs is the
|
|
// default, for a self-hosted deployment as much as for a cloud one: an operator
|
|
// who needs the bundles to stay inside their own infrastructure points either
|
|
// knob at their own upload service, and until they do the everyday
|
|
// "collect a bundle and send it to support" flow keeps working.
|
|
func ResolveUploadURL(requested, published string) string {
|
|
if requested != "" {
|
|
return requested
|
|
}
|
|
|
|
if published != "" {
|
|
return published
|
|
}
|
|
|
|
return types.DefaultBundleURL
|
|
}
|