sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-08-24 16:41:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Serve the initiating peer a map that carries the advanced serial

Browse Source
This commit is contained in:
Viktor Liu
2026-08-20 14:49:41 +02:00
parent 7033daeed4
commit f19deb9734
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
management/server/peer.go
View File

@@ -1066,12 +1066,18 @@ func (am *DefaultAccountManager) SyncPeer(ctx context.Context, sync types.PeerSy
metaDiffAffectsPosture := posture.AffectsPosture(ctx, &metaDiff, resPostureChecks)
if requiresPeerUpdate(ctx, isStatusChanged, sync.UpdateAccountPeers, ipv6CapabilityChanged, metaDiffAffectsPosture, metaDiff.VersionChanged(), metaDiff.HostnameChanged()) {
// The maps pushed below carry changed content (the peer's version,
// The maps sent out below carry changed content (the peer's version,
// hostname, capabilities, or validation state). The serial versions the
// distributed map, so it must advance with the content.
if err = am.Store.IncrementNetworkSerial(ctx, accountID); err != nil {
return nil, nil, nil, 0, fmt.Errorf("increment network serial: %w", err)
}
// The map built above predates the increment; rebuild it so the syncing
// peer's own response also carries the advanced serial.
nmap, resPostureChecks, dnsFwdPort, err = am.networkMapController.GetValidatedPeerWithMap(ctx, peerNotValid, accountID, peer.ID)
if err != nil {
return nil, nil, nil, 0, err
}
changedPeerIDs := []string{peer.ID}
affectedPeerIDs := am.syncPeerAffectedPeers(ctx, accountID, peer.ID, nmap, peerNotValid, metaDiffAffectsPosture)
if err = am.networkMapController.OnPeersUpdated(ctx, accountID, changedPeerIDs, affectedPeerIDs); err != nil {
@@ -1236,17 +1242,22 @@ func (am *DefaultAccountManager) LoginPeer(ctx context.Context, login types.Peer
return nil, nil, nil, false, err
}
if shouldUpdatePeers {
// The maps sent out below carry changed peer content. The serial versions
// the distributed map, so it must advance with the content, and before the
// network is loaded for the response so the logging-in peer also sees the
// advanced serial.
if err = am.Store.IncrementNetworkSerial(ctx, accountID); err != nil {
return nil, nil, nil, false, fmt.Errorf("increment network serial: %w", err)
}
}
network, postureChecks, enableSSH, err := getPeerLoginInfo(ctx, am.Store, accountID, peer, !isRequiresApproval)
if err != nil {
return nil, nil, nil, false, err
}
if shouldUpdatePeers {
// The maps pushed below carry changed peer content. The serial versions
// the distributed map, so it must advance with the content.
if err = am.Store.IncrementNetworkSerial(ctx, accountID); err != nil {
return nil, nil, nil, false, fmt.Errorf("increment network serial: %w", err)
}
changedPeerIDs := []string{peer.ID}
affectedPeerIDs := am.resolveAffectedPeersForPeerChanges(ctx, am.Store, accountID, changedPeerIDs)
if err = am.networkMapController.OnPeersUpdated(ctx, accountID, changedPeerIDs, affectedPeerIDs); err != nil {

4
management/server/peer_test.go
View File

@@ -2856,7 +2856,7 @@ func TestSyncPeer_PeerUpdateBumpsNetworkSerial(t *testing.T) {
newMeta := peer2.Meta
newMeta.WtVersion = "0.99.99"
_, _, _, _, err := manager.SyncPeer(context.Background(), types.PeerSync{
_, nmap, _, _, err := manager.SyncPeer(context.Background(), types.PeerSync{
WireGuardPubKey: peer2.Key,
Meta: newMeta,
}, peer2.AccountID)
@@ -2865,6 +2865,8 @@ func TestSyncPeer_PeerUpdateBumpsNetworkSerial(t *testing.T) {
network, err := manager.Store.GetAccountNetwork(context.Background(), store.LockingStrengthNone, account.Id)
require.NoError(t, err)
assert.Greater(t, network.CurrentSerial(), serialBefore, "a map-relevant meta change should advance the serial")
require.NotNil(t, nmap)
assert.Equal(t, network.CurrentSerial(), nmap.Network.CurrentSerial(), "the syncing peer's own map should carry the advanced serial")
})
}