mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-14 17:39:12 +02:00
Revert "Introduces a forced WG handshake on initial MLKEM bootstrap."
This reverts commit b5a72eca65.
This commit is contained in:
@@ -20,13 +20,10 @@ type EndpointUpdater struct {
|
||||
wgConfig WgConfig
|
||||
initiator bool
|
||||
|
||||
// mu protects cancelFunc and lastEndpoint
|
||||
// mu protects cancelFunc
|
||||
mu sync.Mutex
|
||||
cancelFunc func()
|
||||
updateWg sync.WaitGroup
|
||||
// lastEndpoint is the most recent non-nil endpoint applied to the peer, used to
|
||||
// re-add it on a forced re-handshake (ForceRehandshake).
|
||||
lastEndpoint *net.UDPAddr
|
||||
}
|
||||
|
||||
func NewEndpointUpdater(log *logrus.Entry, wgConfig WgConfig, initiator bool) *EndpointUpdater {
|
||||
@@ -41,10 +38,6 @@ func (e *EndpointUpdater) ConfigureWGEndpoint(addr *net.UDPAddr, presharedKey *w
|
||||
e.mu.Lock()
|
||||
defer e.mu.Unlock()
|
||||
|
||||
if addr != nil {
|
||||
e.lastEndpoint = addr
|
||||
}
|
||||
|
||||
if e.initiator {
|
||||
e.log.Debugf("configure up WireGuard as initiator")
|
||||
return e.configureAsInitiator(addr, presharedKey)
|
||||
@@ -58,36 +51,12 @@ func (e *EndpointUpdater) SwitchWGEndpoint(addr *net.UDPAddr, presharedKey *wgty
|
||||
e.mu.Lock()
|
||||
defer e.mu.Unlock()
|
||||
|
||||
if addr != nil {
|
||||
e.lastEndpoint = addr
|
||||
}
|
||||
|
||||
// prevent to run new update while cancel the previous update
|
||||
e.waitForCloseTheDelayedUpdate()
|
||||
|
||||
return e.updateWireGuardPeer(addr, presharedKey)
|
||||
}
|
||||
|
||||
// ForceRehandshake removes and re-adds the peer so WireGuard drops the current session
|
||||
// and negotiates a fresh one with the given PSK. Used when a post-quantum PSK is
|
||||
// bootstrapped after the session already came up on a pre-PQ key. No-op if no endpoint
|
||||
// has been applied yet (the pending config will pull the PSK itself).
|
||||
func (e *EndpointUpdater) ForceRehandshake(presharedKey *wgtypes.Key) error {
|
||||
e.mu.Lock()
|
||||
defer e.mu.Unlock()
|
||||
|
||||
if e.lastEndpoint == nil {
|
||||
return nil
|
||||
}
|
||||
// Cancel any pending delayed responder update: it carries the stale pre-PQ key and
|
||||
// would otherwise re-poison the session after we reset it.
|
||||
e.waitForCloseTheDelayedUpdate()
|
||||
if err := e.wgConfig.WgInterface.RemovePeer(e.wgConfig.RemoteKey); err != nil {
|
||||
return err
|
||||
}
|
||||
return e.updateWireGuardPeer(e.lastEndpoint, presharedKey)
|
||||
}
|
||||
|
||||
func (e *EndpointUpdater) RemoveWgPeer() error {
|
||||
e.mu.Lock()
|
||||
defer e.mu.Unlock()
|
||||
|
||||
Reference in New Issue
Block a user