mirror of
https://github.com/netbirdio/netbird.git
synced 2026-08-07 02:28:53 -04:00
## Describe your changes Move route select/deselect handling from the daemon server into exported routemanager methods (SelectRoutes, DeselectRoutes, SelectAllRoutes, DeselectAllRoutes) so every consumer shares one implementation: v4/v6 exit-pair expansion, exit-node mutual exclusion, and selection triggering. Previously the exit-node exclusivity lived only in the daemon's SelectNetworks RPC, so the Android and iOS bindings could leave two exit nodes selected until the next network map reconciliation. Both bindings now call the shared manager methods and enforce exclusivity at toggle time, matching the desktop behavior. ## Issue ticket number and link ## Stack <!-- branch-stack --> ### Checklist - [x] Is it a bug fix - [ ] Is a typo/documentation fix - [ ] Is a feature enhancement - [ ] It is a refactor - [ ] Created tests that fail without the change (if possible) - [ ] This change does **not** modify the public API, gRPC protocols, functionality behavior, CLI / service flags, or introduce a new feature — **OR** I have discussed it with the NetBird team beforehand (link the issue / Slack thread in the description). See [CONTRIBUTING.md](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTING.md#discuss-changes-with-the-netbird-team-first). > By submitting this pull request, you confirm that you have read and agree to the terms of the [Contributor License Agreement](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT.md). ## Documentation Select exactly one: - [ ] I added/updated documentation for this change - [x] Documentation is **not needed** for this change (explain why) ### Docs PR URL (required if "docs added" is checked) Paste the PR link from https://github.com/netbirdio/docs here: https://github.com/netbirdio/docs/pull/__ <!-- codesmith:footer --> --- <a href="https://app.blacksmith.sh/netbirdio/codesmith/netbird/pr/6928"><picture><source media="(prefers-color-scheme: dark)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg"><source media="(prefers-color-scheme: light)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-light-v2.svg"><img alt="View with [code]smith" src="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg"></picture></a> <a href="https://backend.blacksmith.sh/track/enable-autofix?expires=1787772098&installation_model_id=427504&pr_number=6928&repository=netbirdio%2Fnetbird&return_to=https%3A%2F%2Fgithub.com%2Fnetbirdio%2Fnetbird%2Fpull%2F6928&signature=31ad59e1483e1582cd447a8db2fe21e5309230e631cbd0cad0f977cd15fb7b9b"><picture><source media="(prefers-color-scheme: dark)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-dark.svg"><source media="(prefers-color-scheme: light)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-light.svg"><img alt="Autofix with [code]smith" src="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-dark.svg"></picture></a> <sup>Need help on this PR? Tag <code>@codesmith-bot</code> with what you need. Autofix is disabled.</sup> <!-- codesmith:autofix:disabled --> <!-- /codesmith:footer --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Route selection/deselection is now handled through shared route-manager APIs for both individual routes and “all routes”. * Exit-node selections automatically enforce mutual exclusivity while keeping non-exit routes unaffected. * **Bug Fixes** * Unknown or unavailable route IDs now return errors, and exclusivity is preserved even when some route IDs fail. * **Tests** * Added route-selection tests covering exclusivity (including IPv4/IPv6), select-all behavior, partial errors, and invalid IDs. * **Refactor / Chores** * Simplified Android, iOS, and server routing flows to delegate to the shared manager; updated mocks and removed redundant routing command logic/dependencies. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
152 lines
5.0 KiB
Go
152 lines
5.0 KiB
Go
package routemanager
|
|
|
|
import (
|
|
"context"
|
|
|
|
firewall "github.com/netbirdio/netbird/client/firewall/manager"
|
|
"github.com/netbirdio/netbird/client/iface"
|
|
"github.com/netbirdio/netbird/client/internal/listener"
|
|
"github.com/netbirdio/netbird/client/internal/routeselector"
|
|
"github.com/netbirdio/netbird/client/internal/statemanager"
|
|
"github.com/netbirdio/netbird/route"
|
|
)
|
|
|
|
// MockManager is the mock instance of a route manager
|
|
type MockManager struct {
|
|
ClassifyRoutesFunc func(routes []*route.Route) (map[route.ID]*route.Route, route.HAMap)
|
|
UpdateRoutesFunc func(updateSerial uint64, serverRoutes map[route.ID]*route.Route, clientRoutes route.HAMap, useNewDNSRoute bool) error
|
|
TriggerSelectionFunc func(haMap route.HAMap)
|
|
SelectRoutesFunc func(ids []route.NetID, appendRoute bool) error
|
|
DeselectRoutesFunc func(ids []route.NetID) error
|
|
GetRouteSelectorFunc func() *routeselector.RouteSelector
|
|
GetClientRoutesFunc func() route.HAMap
|
|
GetSelectedClientRoutesFunc func() route.HAMap
|
|
GetActiveClientRoutesFunc func() route.HAMap
|
|
GetClientRoutesWithNetIDFunc func() map[route.NetID][]*route.Route
|
|
StopFunc func(manager *statemanager.Manager)
|
|
}
|
|
|
|
func (m *MockManager) Init() error {
|
|
return nil
|
|
}
|
|
|
|
// InitialRouteRange mock implementation of InitialRouteRange from Manager interface
|
|
func (m *MockManager) InitialRouteRange() []string {
|
|
return nil
|
|
}
|
|
|
|
// UpdateRoutes mock implementation of UpdateRoutes from Manager interface
|
|
func (m *MockManager) UpdateRoutes(updateSerial uint64, newRoutes map[route.ID]*route.Route, clientRoutes route.HAMap, useNewDNSRoute bool) error {
|
|
if m.UpdateRoutesFunc != nil {
|
|
return m.UpdateRoutesFunc(updateSerial, newRoutes, clientRoutes, useNewDNSRoute)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ClassifyRoutes mock implementation of ClassifyRoutes from Manager interface
|
|
func (m *MockManager) ClassifyRoutes(routes []*route.Route) (map[route.ID]*route.Route, route.HAMap) {
|
|
if m.ClassifyRoutesFunc != nil {
|
|
return m.ClassifyRoutesFunc(routes)
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
func (m *MockManager) TriggerSelection(networks route.HAMap) {
|
|
if m.TriggerSelectionFunc != nil {
|
|
m.TriggerSelectionFunc(networks)
|
|
}
|
|
}
|
|
|
|
// SelectRoutes mock implementation of SelectRoutes from Manager interface
|
|
func (m *MockManager) SelectRoutes(ids []route.NetID, appendRoute bool) error {
|
|
if m.SelectRoutesFunc != nil {
|
|
return m.SelectRoutesFunc(ids, appendRoute)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DeselectRoutes mock implementation of DeselectRoutes from Manager interface
|
|
func (m *MockManager) DeselectRoutes(ids []route.NetID) error {
|
|
if m.DeselectRoutesFunc != nil {
|
|
return m.DeselectRoutesFunc(ids)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SelectAllRoutes mock implementation of SelectAllRoutes from Manager interface
|
|
func (m *MockManager) SelectAllRoutes() {
|
|
}
|
|
|
|
// DeselectAllRoutes mock implementation of DeselectAllRoutes from Manager interface
|
|
func (m *MockManager) DeselectAllRoutes() {
|
|
}
|
|
|
|
// GetRouteSelector mock implementation of GetRouteSelector from Manager interface
|
|
func (m *MockManager) GetRouteSelector() *routeselector.RouteSelector {
|
|
if m.GetRouteSelectorFunc != nil {
|
|
return m.GetRouteSelectorFunc()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetClientRoutes mock implementation of GetClientRoutes from the Manager interface
|
|
func (m *MockManager) GetClientRoutes() route.HAMap {
|
|
if m.GetClientRoutesFunc != nil {
|
|
return m.GetClientRoutesFunc()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetSelectedClientRoutes mock implementation of GetSelectedClientRoutes from the Manager interface
|
|
func (m *MockManager) GetSelectedClientRoutes() route.HAMap {
|
|
if m.GetSelectedClientRoutesFunc != nil {
|
|
return m.GetSelectedClientRoutesFunc()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetActiveClientRoutes mock implementation of GetActiveClientRoutes from the Manager interface
|
|
func (m *MockManager) GetActiveClientRoutes() route.HAMap {
|
|
if m.GetActiveClientRoutesFunc != nil {
|
|
return m.GetActiveClientRoutesFunc()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetClientRoutesWithNetID mock implementation of GetClientRoutesWithNetID from Manager interface
|
|
func (m *MockManager) GetClientRoutesWithNetID() map[route.NetID][]*route.Route {
|
|
if m.GetClientRoutesWithNetIDFunc != nil {
|
|
return m.GetClientRoutesWithNetIDFunc()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Start mock implementation of Start from Manager interface
|
|
func (m *MockManager) Start(ctx context.Context, iface *iface.WGIface) {
|
|
}
|
|
|
|
// SetRouteChangeListener mock implementation of SetRouteChangeListener from Manager interface
|
|
func (m *MockManager) SetRouteChangeListener(listener listener.NetworkChangeListener) {
|
|
|
|
}
|
|
|
|
func (m *MockManager) SetFirewall(firewall.Manager) error {
|
|
panic("implement me")
|
|
}
|
|
|
|
// SetDNSForwarderPort mock implementation of SetDNSForwarderPort from Manager interface
|
|
func (m *MockManager) SetDNSForwarderPort(port uint16) {
|
|
}
|
|
|
|
// ReconcilePeerAllowedIPs mock implementation of ReconcilePeerAllowedIPs from Manager interface
|
|
func (m *MockManager) ReconcilePeerAllowedIPs(peerKey string) error {
|
|
return nil
|
|
}
|
|
|
|
// Stop mock implementation of Stop from Manager interface
|
|
func (m *MockManager) Stop(stateManager *statemanager.Manager) {
|
|
if m.StopFunc != nil {
|
|
m.StopFunc(stateManager)
|
|
}
|
|
}
|