mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-26 14:29:08 +01:00
[management] Fix agent-network proxy-peer fan-out on affected-peer recompute
The affected-peers resolver loaded only persisted reverse-proxy services, but agent-network services are synthesized on demand and never persisted. As a result the embedded proxy peer was never folded into the affected set when a client's group changed, so the proxy received no network-map update for a newly authorised client and rejected its handshake until a full resync (restart). loadProxyServices now merges the synthesized agent-network services (injected via a registration hook to avoid an import cycle), so proxy peers learn newly authorised clients immediately.
This commit is contained in:
@@ -0,0 +1,95 @@
|
||||
package affectedpeers
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service"
|
||||
"github.com/netbirdio/netbird/management/server/store"
|
||||
)
|
||||
|
||||
// fakeProxyStore implements only the two store methods loadProxyServices calls;
|
||||
// the embedded nil store.Store panics if anything else is invoked, which keeps
|
||||
// the test honest about the surface under test.
|
||||
type fakeProxyStore struct {
|
||||
store.Store
|
||||
proxyByCluster map[string][]string
|
||||
persisted []*rpservice.Service
|
||||
}
|
||||
|
||||
func (f *fakeProxyStore) GetEmbeddedProxyPeerIDsByCluster(_ context.Context, _ string) (map[string][]string, error) {
|
||||
return f.proxyByCluster, nil
|
||||
}
|
||||
|
||||
func (f *fakeProxyStore) GetAccountServices(_ context.Context, _ store.LockingStrength, _ string) ([]*rpservice.Service, error) {
|
||||
return f.persisted, nil
|
||||
}
|
||||
|
||||
func serviceIDs(svcs []*rpservice.Service) []string {
|
||||
ids := make([]string, 0, len(svcs))
|
||||
for _, s := range svcs {
|
||||
ids = append(ids, s.ID)
|
||||
}
|
||||
return ids
|
||||
}
|
||||
|
||||
// loadProxyServices must merge the synthesised agent-network services (which are
|
||||
// never persisted) with the persisted ones, so the proxy-affected expansion can
|
||||
// see agent-network AccessGroups. Without this the embedded proxy peer is never
|
||||
// flagged on a client group change and only a full resync (restart) recovers.
|
||||
func TestLoadProxyServices_MergesSynthesizedAgentNetworkServices(t *testing.T) {
|
||||
prev := agentNetworkSynthesizer
|
||||
t.Cleanup(func() { agentNetworkSynthesizer = prev })
|
||||
SetAgentNetworkSynthesizer(func(_ context.Context, _ store.Store, _ string) ([]*rpservice.Service, error) {
|
||||
return []*rpservice.Service{
|
||||
{ID: "agent-net-svc-acc", ProxyCluster: "proxy.netbird.local", Private: true, AccessGroups: []string{"gB"}},
|
||||
}, nil
|
||||
})
|
||||
|
||||
s := &fakeProxyStore{
|
||||
proxyByCluster: map[string][]string{"proxy.netbird.local": {"proxy-peer-1"}},
|
||||
persisted: []*rpservice.Service{{ID: "persisted-rp-svc", ProxyCluster: "proxy.netbird.local"}},
|
||||
}
|
||||
snap := &Snapshot{}
|
||||
require.NoError(t, snap.loadProxyServices(context.Background(), s, "acc"))
|
||||
|
||||
ids := serviceIDs(snap.services)
|
||||
assert.Contains(t, ids, "persisted-rp-svc", "persisted services must be kept")
|
||||
assert.Contains(t, ids, "agent-net-svc-acc", "synthesised agent-network service must be merged in")
|
||||
}
|
||||
|
||||
// With no synthesiser registered, loadProxyServices falls back to persisted
|
||||
// services only (no panic, no behaviour change for non-agent-network builds).
|
||||
func TestLoadProxyServices_NoSynthesizerRegistered(t *testing.T) {
|
||||
prev := agentNetworkSynthesizer
|
||||
t.Cleanup(func() { agentNetworkSynthesizer = prev })
|
||||
agentNetworkSynthesizer = nil
|
||||
|
||||
s := &fakeProxyStore{
|
||||
proxyByCluster: map[string][]string{"c": {"proxy-1"}},
|
||||
persisted: []*rpservice.Service{{ID: "persisted"}},
|
||||
}
|
||||
snap := &Snapshot{}
|
||||
require.NoError(t, snap.loadProxyServices(context.Background(), s, "acc"))
|
||||
assert.Equal(t, []string{"persisted"}, serviceIDs(snap.services))
|
||||
}
|
||||
|
||||
// No embedded proxy peers → skip entirely (don't even call the synthesiser).
|
||||
func TestLoadProxyServices_NoEmbeddedProxyPeersSkips(t *testing.T) {
|
||||
prev := agentNetworkSynthesizer
|
||||
t.Cleanup(func() { agentNetworkSynthesizer = prev })
|
||||
called := false
|
||||
SetAgentNetworkSynthesizer(func(_ context.Context, _ store.Store, _ string) ([]*rpservice.Service, error) {
|
||||
called = true
|
||||
return nil, nil
|
||||
})
|
||||
|
||||
s := &fakeProxyStore{proxyByCluster: map[string][]string{}}
|
||||
snap := &Snapshot{}
|
||||
require.NoError(t, snap.loadProxyServices(context.Background(), s, "acc"))
|
||||
assert.False(t, called, "synthesiser must not run for accounts without embedded proxy peers")
|
||||
assert.Empty(t, snap.services)
|
||||
}
|
||||
Reference in New Issue
Block a user