Mirrors/wg-portal
1
0
Fork 0
mirror of https://github.com/h44z/wg-portal.git synced 2025-04-19 08:55:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix invalid ip suggestions (#185)

Browse Source
This commit is contained in:
Christoph Haas 2023-10-20 12:13:39 +02:00
parent d78b4f49bd
commit b49ff66c41
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/adapters/database.go
View File

@ -601,7 +601,7 @@ func (r *SqlRepo) GetPeerIps(ctx context.Context) (map[domain.PeerIdentifier][]d
return result, nil return result, nil
} }
func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context) (map[domain.Cidr][]domain.Cidr, error) { func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr) (map[domain.Cidr][]domain.Cidr, error) {
var peerIps []struct { var peerIps []struct {
domain.Cidr domain.Cidr
PeerId domain.PeerIdentifier `gorm:"column:peer_identifier"` PeerId domain.PeerIdentifier `gorm:"column:peer_identifier"`
@ -628,14 +628,26 @@ func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context) (map[domain.Cidr][]do
return nil, fmt.Errorf("failed to fetch interface IP's: %w", err) return nil, fmt.Errorf("failed to fetch interface IP's: %w", err)
} }
result := make(map[domain.Cidr][]domain.Cidr) result := make(map[domain.Cidr][]domain.Cidr, len(subnets))
for _, ip := range interfaceIps { for _, ip := range interfaceIps {
networkAddr := ip.Cidr.NetworkAddr() var subnet domain.Cidr // default empty subnet (if no subnet matches, we will add the IP to the empty subnet group)
result[networkAddr] = append(result[networkAddr], ip.Cidr) for _, s := range subnets {
if s.Contains(ip.Cidr) {
subnet = s
break
}
}
result[subnet] = append(result[subnet], ip.Cidr)
} }
for _, ip := range peerIps { for _, ip := range peerIps {
networkAddr := ip.Cidr.NetworkAddr() var subnet domain.Cidr // default empty subnet (if no subnet matches, we will add the IP to the empty subnet group)
result[networkAddr] = append(result[networkAddr], ip.Cidr) for _, s := range subnets {
if s.Contains(ip.Cidr) {
subnet = s
break
}
}
result[subnet] = append(result[subnet], ip.Cidr)
} }
return result, nil return result, nil
} }

2
internal/app/wireguard/repos.go
View File

@ -21,7 +21,7 @@ type InterfaceAndPeerDatabaseRepo interface {
SavePeer(ctx context.Context, id domain.PeerIdentifier, updateFunc func(in *domain.Peer) (*domain.Peer, error)) error SavePeer(ctx context.Context, id domain.PeerIdentifier, updateFunc func(in *domain.Peer) (*domain.Peer, error)) error
DeletePeer(ctx context.Context, id domain.PeerIdentifier) error DeletePeer(ctx context.Context, id domain.PeerIdentifier) error
GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domain.Peer, error) GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domain.Peer, error)
GetUsedIpsPerSubnet(ctx context.Context) (map[domain.Cidr][]domain.Cidr, error) GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr) (map[domain.Cidr][]domain.Cidr, error)
} }
type StatisticsDatabaseRepo interface { type StatisticsDatabaseRepo interface {

6
internal/app/wireguard/wireguard_peers.go
View File

@ -292,13 +292,17 @@ func (m Manager) savePeers(ctx context.Context, peers ...*domain.Peer) error {
} }
func (m Manager) getFreshPeerIpConfig(ctx context.Context, iface *domain.Interface) (ips []domain.Cidr, err error) { func (m Manager) getFreshPeerIpConfig(ctx context.Context, iface *domain.Interface) (ips []domain.Cidr, err error) {
if iface.PeerDefNetworkStr == "" {
return []domain.Cidr{}, nil // cannot suggest new ip addresses if there is no subnet
}
networks, err := domain.CidrsFromString(iface.PeerDefNetworkStr) networks, err := domain.CidrsFromString(iface.PeerDefNetworkStr)
if err != nil { if err != nil {
err = fmt.Errorf("failed to parse default network address: %w", err) err = fmt.Errorf("failed to parse default network address: %w", err)
return return
} }
existingIps, err := m.db.GetUsedIpsPerSubnet(ctx) existingIps, err := m.db.GetUsedIpsPerSubnet(ctx, networks)
if err != nil { if err != nil {
err = fmt.Errorf("failed to get existing IP addresses: %w", err) err = fmt.Errorf("failed to get existing IP addresses: %w", err)
return return

7
internal/domain/ip.go
View File

@ -199,3 +199,10 @@ func CidrsToStringSlice(slice []Cidr) []string {
return cidrs return cidrs
} }
func (c Cidr) Contains(other Cidr) bool {
_, subnet, _ := net.ParseCIDR(c.String())
otherIP, _, _ := net.ParseCIDR(other.String())
return subnet.Contains(otherIP)
}