apps/cunicu
1
0
Fork 0
mirror of https://codeberg.org/cunicu/cunicu.git synced 2025-10-08 18:20:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

daemon: use per-interface features

Browse Source 
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel
2022-09-30 08:32:26 +02:00
parent 70e437d9a6
commit 92a7ad2f7f
99 changed files with 3510 additions and 2599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/core/peer.go
View File

@@ -29,7 +29,7 @@ type Peer struct {
LastReceiveTime time.Time
LastTransmitTime time.Time
onModified []PeerHandler
onModified []PeerModifiedHandler
client *wgctrl.Client
@@ -42,7 +42,7 @@ func NewPeer(wgp *wgtypes.Peer, i *Interface) (*Peer, error) {
Interface: i,
Peer: wgp,
onModified: []PeerHandler{},
onModified: []PeerModifiedHandler{},
client: i.client,
logger: zap.L().Named("peer").With(
@@ -124,7 +124,7 @@ func (p *Peer) WireGuardConfig() *wgtypes.PeerConfig {
}
// OnModified registers a new handler which is called whenever the peer has been modified
func (p *Peer) OnModified(h PeerHandler) {
func (p *Peer) OnModified(h PeerModifiedHandler) {
p.onModified = append(p.onModified, h)
}
@@ -174,6 +174,13 @@ func (p *Peer) SetPresharedKey(psk *crypto.Key) error {
// AddAllowedIP adds a new IP network to the allowed ip list of the WireGuard peer
func (p *Peer) AddAllowedIP(a net.IPNet) error {
if util.SliceContains(p.AllowedIPs, func(n net.IPNet) bool {
return util.CmpNet(n, a) == 0
}) {
p.logger.Warn("Not adding already existing allowed IP", zap.Any("ip", a))
return nil
}
cfg := wgtypes.Config{
Peers: []wgtypes.PeerConfig{
{
@@ -190,11 +197,13 @@ func (p *Peer) AddAllowedIP(a net.IPNet) error {
}
// RemoveAllowedIP removes a new IP network from the allowed ip list of the WireGuard peer
func (p *Peer) RemoveAllowedIP(a *net.IPNet) error {
ips := util.FilterSlice(p.Peer.AllowedIPs, func(b net.IPNet) bool {
return util.CmpNet(a, &b) != 0
func (p *Peer) RemoveAllowedIP(a net.IPNet) error {
ips := util.SliceFilter(p.Peer.AllowedIPs, func(b net.IPNet) bool {
return util.CmpNet(a, b) != 0
})
// TODO: Check is net is in AllowedIPs before attempting removing it
cfg := wgtypes.Config{
Peers: []wgtypes.PeerConfig{
{
@@ -243,7 +252,7 @@ func (p *Peer) Sync(new *wgtypes.Peer) (PeerModifier, []net.IPNet, []net.IPNet)
}
// Find changes in AllowedIP list
ipsAdded, ipsRemoved, _ := util.DiffSliceFunc(old.AllowedIPs, new.AllowedIPs, util.CmpNet)
ipsAdded, ipsRemoved, _ := util.SliceDiffFunc(old.AllowedIPs, new.AllowedIPs, util.CmpNet)
if len(ipsAdded) > 0 || len(ipsRemoved) > 0 {
mod |= PeerModifiedAllowedIPs
}