mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-30 22:26:42 +00:00
Initial concept
This commit is contained in:
56
client/internal/lazyconn/listener/listener.go
Normal file
56
client/internal/lazyconn/listener/listener.go
Normal file
@@ -0,0 +1,56 @@
|
||||
package listener
|
||||
|
||||
import (
|
||||
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
||||
"net"
|
||||
"sync"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type Listener struct {
|
||||
peerID wgtypes.Key
|
||||
|
||||
conn *net.UDPConn
|
||||
wg sync.WaitGroup
|
||||
}
|
||||
|
||||
func NewListener(peerID wgtypes.Key, addr *net.UDPAddr) (*Listener, error) {
|
||||
conn, err := net.ListenUDP("udp", addr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
d := &Listener{
|
||||
conn: conn,
|
||||
peerID: peerID,
|
||||
}
|
||||
return d, nil
|
||||
}
|
||||
|
||||
func (d *Listener) ReadPackets(trigger func(peerID wgtypes.Key)) {
|
||||
d.wg.Done()
|
||||
defer d.wg.Done()
|
||||
|
||||
for {
|
||||
buffer := make([]byte, 10)
|
||||
n, remoteAddr, err := d.conn.ReadFromUDP(buffer)
|
||||
if err != nil {
|
||||
log.Infof("exit from fake peer reader: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
if n < 4 {
|
||||
log.Warnf("received %d bytes from %s, too short", n, remoteAddr)
|
||||
continue
|
||||
}
|
||||
trigger(d.peerID)
|
||||
}
|
||||
}
|
||||
|
||||
func (d *Listener) Close() {
|
||||
if err := d.conn.Close(); err != nil {
|
||||
log.Errorf("failed to close UDP listener: %s", err)
|
||||
}
|
||||
d.wg.Wait()
|
||||
}
|
||||
133
client/internal/lazyconn/listener/manager.go
Normal file
133
client/internal/lazyconn/listener/manager.go
Normal file
@@ -0,0 +1,133 @@
|
||||
package listener
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
||||
|
||||
"github.com/netbirdio/netbird/client/internal/lazyconn"
|
||||
)
|
||||
|
||||
type portGenerator struct {
|
||||
nextFreePort uint16
|
||||
}
|
||||
|
||||
func newPortGenerator() *portGenerator {
|
||||
return &portGenerator{
|
||||
nextFreePort: 65535,
|
||||
}
|
||||
}
|
||||
|
||||
func (p *portGenerator) nextPort() int {
|
||||
port := p.nextFreePort
|
||||
p.nextFreePort--
|
||||
if p.nextFreePort == 0 {
|
||||
p.nextFreePort = 65535
|
||||
}
|
||||
return int(port)
|
||||
}
|
||||
|
||||
type Manager struct {
|
||||
TrafficStartChan chan wgtypes.Key
|
||||
|
||||
wgIface lazyconn.WGIface
|
||||
|
||||
portGenerator *portGenerator
|
||||
peers map[wgtypes.Key]*Listener
|
||||
done chan struct{}
|
||||
}
|
||||
|
||||
func NewManager(wgIface lazyconn.WGIface) *Manager {
|
||||
m := &Manager{
|
||||
TrafficStartChan: make(chan wgtypes.Key, 1),
|
||||
wgIface: wgIface,
|
||||
portGenerator: newPortGenerator(),
|
||||
done: make(chan struct{}),
|
||||
}
|
||||
return m
|
||||
}
|
||||
|
||||
func (m *Manager) CreateFakePeers(peerCfg lazyconn.PeerConfig) error {
|
||||
if _, ok := m.peers[peerCfg.PublicKey]; ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
if err := m.createFakePeer(peerCfg); err != nil {
|
||||
return err
|
||||
}
|
||||
log.Debugf("created lazy connection listener for: %s", peerCfg.PublicKey.String())
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Manager) RemovePeer(peerID wgtypes.Key) {
|
||||
listener, ok := m.peers[peerID]
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
listener.Close()
|
||||
|
||||
if err := m.wgIface.RemovePeer(peerID); err != nil {
|
||||
log.Warnf("failed to remove fake peer: %v", err)
|
||||
}
|
||||
|
||||
delete(m.peers, peerID)
|
||||
}
|
||||
|
||||
func (m *Manager) Close() {
|
||||
close(m.done)
|
||||
for peerID, listener := range m.peers {
|
||||
listener.Close()
|
||||
delete(m.peers, peerID)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Manager) createFakePeer(peerCfg lazyconn.PeerConfig) error {
|
||||
var (
|
||||
listener *Listener
|
||||
err error
|
||||
addr *net.UDPAddr
|
||||
)
|
||||
for i := 0; i < 100; i++ {
|
||||
addr = &net.UDPAddr{
|
||||
Port: m.portGenerator.nextPort(),
|
||||
IP: net.ParseIP("127.0.0.254"),
|
||||
}
|
||||
listener, err = NewListener(peerCfg.PublicKey, addr)
|
||||
if err != nil {
|
||||
log.Debugf("failed to allocate port: %d: %v", addr.Port, err)
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
if listener == nil {
|
||||
return fmt.Errorf("failed to allocate lazy connection port for: %s", peerCfg.PublicKey.String())
|
||||
}
|
||||
|
||||
if err := m.createEndpoint(peerCfg, addr); err != nil {
|
||||
log.Errorf("failed to create endpoint for %s: %v", peerCfg.PublicKey.String(), err)
|
||||
listener.Close()
|
||||
return err
|
||||
}
|
||||
|
||||
go listener.ReadPackets(m.onTrigger)
|
||||
|
||||
m.peers[peerCfg.PublicKey] = listener
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Manager) onTrigger(peerID wgtypes.Key) {
|
||||
if err := m.wgIface.RemovePeer(peerID); err != nil {
|
||||
log.Errorf("failed to remove peer: %v", err)
|
||||
}
|
||||
select {
|
||||
case <-m.done:
|
||||
case m.TrafficStartChan <- peerID:
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Manager) createEndpoint(peerCfg lazyconn.PeerConfig, endpoint *net.UDPAddr) error {
|
||||
return m.wgIface.UpdatePeer(peerCfg.PublicKey.String(), peerCfg.AllowedIP.String(), 0, endpoint, nil)
|
||||
}
|
||||
118
client/internal/lazyconn/manager/manager.go
Normal file
118
client/internal/lazyconn/manager/manager.go
Normal file
@@ -0,0 +1,118 @@
|
||||
package manager
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
||||
|
||||
"github.com/netbirdio/netbird/client/internal/lazyconn"
|
||||
"github.com/netbirdio/netbird/client/internal/lazyconn/listener"
|
||||
"github.com/netbirdio/netbird/client/internal/lazyconn/watcher"
|
||||
)
|
||||
|
||||
type Manager struct {
|
||||
watcher *watcher.Watcher
|
||||
listenerMgr *listener.Manager
|
||||
managedPeers map[wgtypes.Key]lazyconn.PeerConfig
|
||||
|
||||
addPeers chan []lazyconn.PeerConfig
|
||||
removePeer chan wgtypes.Key
|
||||
|
||||
watcherWG sync.WaitGroup
|
||||
mu sync.Mutex
|
||||
}
|
||||
|
||||
func NewManager(wgIface lazyconn.WGIface) *Manager {
|
||||
m := &Manager{
|
||||
watcher: watcher.NewWatcher(wgIface),
|
||||
listenerMgr: listener.NewManager(wgIface),
|
||||
managedPeers: make(map[wgtypes.Key]lazyconn.PeerConfig),
|
||||
addPeers: make(chan []lazyconn.PeerConfig, 1),
|
||||
removePeer: make(chan wgtypes.Key, 1),
|
||||
}
|
||||
return m
|
||||
}
|
||||
|
||||
func (m *Manager) Start() {
|
||||
m.mu.Lock()
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
m.watcherWG.Add(1)
|
||||
m.mu.Unlock()
|
||||
|
||||
go func() {
|
||||
m.watcher.Watch(ctx)
|
||||
m.watcherWG.Done()
|
||||
}()
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case peerID := <-m.watcher.PeerTimedOutChan:
|
||||
m.mu.Lock()
|
||||
cfg, ok := m.managedPeers[peerID]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
|
||||
if err := m.listenerMgr.CreateFakePeers(cfg); err != nil {
|
||||
log.Errorf("failed to start watch lazy connection tries: %s", err)
|
||||
}
|
||||
m.mu.Unlock()
|
||||
case peerID := <-m.listenerMgr.TrafficStartChan:
|
||||
m.mu.Lock()
|
||||
_, ok := m.managedPeers[peerID]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
|
||||
log.Infof("peer %s started to send traffic", peerID)
|
||||
m.watcher.AddPeer(peerID)
|
||||
m.notifyPeerAction(peerID)
|
||||
m.mu.Unlock()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Manager) SetPeer(peer lazyconn.PeerConfig) error {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
if _, ok := m.managedPeers[peer.PublicKey]; ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
if err := m.listenerMgr.CreateFakePeers(peer); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// todo: remove removed peers from the list
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Manager) RemovePeer(peerID wgtypes.Key) {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
m.watcher.RemovePeer(peerID)
|
||||
m.listenerMgr.RemovePeer(peerID)
|
||||
delete(m.managedPeers, peerID)
|
||||
}
|
||||
|
||||
func (m *Manager) Close() {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
m.listenerMgr.Close()
|
||||
m.watcherWG.Wait()
|
||||
m.managedPeers = make(map[wgtypes.Key]lazyconn.PeerConfig)
|
||||
}
|
||||
|
||||
func (m *Manager) notifyPeerAction(peerID wgtypes.Key) {
|
||||
// todo notify engine
|
||||
}
|
||||
12
client/internal/lazyconn/peercfg.go
Normal file
12
client/internal/lazyconn/peercfg.go
Normal file
@@ -0,0 +1,12 @@
|
||||
package lazyconn
|
||||
|
||||
import (
|
||||
"net"
|
||||
|
||||
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
||||
)
|
||||
|
||||
type PeerConfig struct {
|
||||
PublicKey wgtypes.Key
|
||||
AllowedIP net.IPNet
|
||||
}
|
||||
103
client/internal/lazyconn/watcher/watcher.go
Normal file
103
client/internal/lazyconn/watcher/watcher.go
Normal file
@@ -0,0 +1,103 @@
|
||||
package watcher
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
||||
|
||||
"github.com/netbirdio/netbird/client/iface/configurer"
|
||||
"github.com/netbirdio/netbird/client/internal/lazyconn"
|
||||
)
|
||||
|
||||
const (
|
||||
checkPeriod = 75 * time.Second // 3 * keep alive time (25s)
|
||||
expectedMinimumRx = 90 * 2 // 2x keep alive packets
|
||||
)
|
||||
|
||||
type rxHistory struct {
|
||||
received int64
|
||||
}
|
||||
|
||||
type Watcher struct {
|
||||
PeerTimedOutChan chan wgtypes.Key
|
||||
|
||||
wgIface lazyconn.WGIface
|
||||
|
||||
peers map[wgtypes.Key]*rxHistory
|
||||
peersMu sync.Mutex
|
||||
}
|
||||
|
||||
func NewWatcher(wgIface lazyconn.WGIface) *Watcher {
|
||||
return &Watcher{
|
||||
PeerTimedOutChan: make(chan wgtypes.Key, 1),
|
||||
wgIface: wgIface,
|
||||
peers: make(map[wgtypes.Key]*rxHistory),
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Watcher) Watch(ctx context.Context) {
|
||||
timer := time.NewTimer(checkPeriod)
|
||||
defer timer.Stop()
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-timer.C:
|
||||
stats, err := m.wgIface.Transfers()
|
||||
if err != nil {
|
||||
log.Errorf("failed to get peer stats: %s", err)
|
||||
continue
|
||||
}
|
||||
m.checkTimeouts(ctx, stats)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Watcher) AddPeer(peerID wgtypes.Key) {
|
||||
m.peersMu.Lock()
|
||||
defer m.peersMu.Unlock()
|
||||
|
||||
m.peers[peerID] = &rxHistory{}
|
||||
}
|
||||
|
||||
func (m *Watcher) RemovePeer(id wgtypes.Key) {
|
||||
m.peersMu.Lock()
|
||||
defer m.peersMu.Unlock()
|
||||
|
||||
delete(m.peers, id)
|
||||
}
|
||||
|
||||
// Todo: this is a naive implementation, we must to finish it
|
||||
func (m *Watcher) checkTimeouts(ctx context.Context, allPeersStats map[wgtypes.Key]configurer.WGStats) {
|
||||
m.peersMu.Lock()
|
||||
defer m.peersMu.Unlock()
|
||||
|
||||
for p, rxh := range m.peers {
|
||||
s, ok := allPeersStats[p]
|
||||
if !ok {
|
||||
log.Warnf("no stats for peer %s", p)
|
||||
}
|
||||
|
||||
// received bytes since last check
|
||||
received := s.RxBytes - rxh.received
|
||||
if received >= expectedMinimumRx {
|
||||
rxh.received = s.RxBytes
|
||||
continue
|
||||
}
|
||||
|
||||
// todo handle that case when swtich from P2P to Relay and the endpoint has been reseted.
|
||||
|
||||
// peer timed out
|
||||
delete(m.peers, p)
|
||||
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case m.PeerTimedOutChan <- p:
|
||||
}
|
||||
}
|
||||
}
|
||||
16
client/internal/lazyconn/wgiface.go
Normal file
16
client/internal/lazyconn/wgiface.go
Normal file
@@ -0,0 +1,16 @@
|
||||
package lazyconn
|
||||
|
||||
import (
|
||||
"net"
|
||||
"time"
|
||||
|
||||
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
||||
|
||||
"github.com/netbirdio/netbird/client/iface/configurer"
|
||||
)
|
||||
|
||||
type WGIface interface {
|
||||
Transfers() (map[wgtypes.Key]configurer.WGStats, error)
|
||||
RemovePeer(key wgtypes.Key) error
|
||||
UpdatePeer(peerKey string, allowedIps string, keepAlive time.Duration, endpoint *net.UDPAddr, preSharedKey *wgtypes.Key) error
|
||||
}
|
||||
Reference in New Issue
Block a user