extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-01-07 14:39:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle Network out of range (#347)

Browse Source
This commit is contained in:
Misha Bragin 2022-06-02 12:56:02 +02:00 committed by shatoboar
parent 43e472c958
commit 02a6ac44be
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
management/server/grpcserver.go
View File

@ -203,8 +203,11 @@ func (s *Server) registerPeer(peerKey wgtypes.Key, req *proto.LoginRequest) (*Pe
},
})
if err != nil {
if s, ok := status.FromError(err); ok && s.Code() == codes.FailedPrecondition {
return nil, err
s, ok := status.FromError(err)
if ok {
if s.Code() == codes.FailedPrecondition || s.Code() == codes.OutOfRange {
return nil, err
}
}
return nil, status.Errorf(codes.NotFound, "provided setup key doesn't exists")
}

16
management/server/network.go
View File

@ -1,9 +1,10 @@
package server
import (
"fmt"
"github.com/c-robinson/iplib"
"github.com/rs/xid"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"math/rand"
"net"
"sync"
@ -77,13 +78,10 @@ func AllocatePeerIP(ipNet net.IPNet, takenIps []net.IP) (net.IP, error) {
takenIPMap[ip.String()] = struct{}{}
}
ips, _, err := generateIPs(&ipNet, takenIPMap)
if err != nil {
return nil, fmt.Errorf("failed allocating new IP for the ipNet %s and takenIps %s", ipNet.String(), takenIps)
}
ips, _ := generateIPs(&ipNet, takenIPMap)
if len(ips) == 0 {
return nil, fmt.Errorf("failed allocating new IP for the ipNet %s - network is out of IPs", ipNet.String())
return nil, status.Errorf(codes.OutOfRange, "failed allocating new IP for the ipNet %s - network is out of IPs", ipNet.String())
}
// pick a random IP
@ -95,7 +93,7 @@ func AllocatePeerIP(ipNet net.IPNet, takenIps []net.IP) (net.IP, error) {
}
// generateIPs generates a list of all possible IPs of the given network excluding IPs specified in the exclusion list
func generateIPs(ipNet *net.IPNet, exclusions map[string]struct{}) ([]net.IP, int, error) {
func generateIPs(ipNet *net.IPNet, exclusions map[string]struct{}) ([]net.IP, int) {
var ips []net.IP
for ip := ipNet.IP.Mask(ipNet.Mask); ipNet.Contains(ip); incIP(ip) {
@ -108,10 +106,10 @@ func generateIPs(ipNet *net.IPNet, exclusions map[string]struct{}) ([]net.IP, in
lenIPs := len(ips)
switch {
case lenIPs < 2:
return ips, lenIPs, nil
return ips, lenIPs
default:
return ips[1 : len(ips)-1], lenIPs - 2, nil
return ips[1 : len(ips)-1], lenIPs - 2
}
}

5
management/server/peer.go
View File

@ -346,7 +346,10 @@ func (am *DefaultAccountManager) AddPeer(
}
network := account.Network
nextIp, _ := AllocatePeerIP(network.Net, takenIps)
nextIp, err := AllocatePeerIP(network.Net, takenIps)
if err != nil {
return nil, err
}
newPeer := &Peer{
Key: peer.Key,