f-57: api: gateway et adresse d'émission calculées en vxlan, adresses réservées refusées pour les VM #57
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
1014712366
commit
5d314e45e1
14 changed files with 591 additions and 46 deletions
88
internal/subnet/addressing.go
Normal file
88
internal/subnet/addressing.go
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
package subnet
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/netip"
|
||||
)
|
||||
|
||||
const MaxAnycastPrefix = 29
|
||||
|
||||
type Addresses struct {
|
||||
Prefix netip.Prefix
|
||||
Network netip.Addr
|
||||
Broadcast netip.Addr
|
||||
Gateway netip.Addr
|
||||
Relay netip.Addr
|
||||
}
|
||||
|
||||
func ParsePrefix(cidr string) (netip.Prefix, error) {
|
||||
prefix, err := netip.ParsePrefix(cidr)
|
||||
if err != nil {
|
||||
return netip.Prefix{}, fmt.Errorf("invalid cidr %q", cidr)
|
||||
}
|
||||
if !prefix.Addr().Is4() {
|
||||
return netip.Prefix{}, fmt.Errorf("cidr %q is not ipv4", cidr)
|
||||
}
|
||||
if prefix.Masked() != prefix {
|
||||
return netip.Prefix{}, fmt.Errorf("cidr %q has host bits set, expected %s", cidr, prefix.Masked())
|
||||
}
|
||||
return prefix, nil
|
||||
}
|
||||
|
||||
func broadcastOf(prefix netip.Prefix) netip.Addr {
|
||||
b := prefix.Addr().As4()
|
||||
host := uint32(1)<<(32-prefix.Bits()) - 1
|
||||
v := uint32(b[0])<<24 | uint32(b[1])<<16 | uint32(b[2])<<8 | uint32(b[3]) | host
|
||||
return netip.AddrFrom4([4]byte{byte(v >> 24), byte(v >> 16), byte(v >> 8), byte(v)})
|
||||
}
|
||||
|
||||
func AnycastAddresses(cidr string) (Addresses, error) {
|
||||
prefix, err := ParsePrefix(cidr)
|
||||
if err != nil {
|
||||
return Addresses{}, err
|
||||
}
|
||||
if prefix.Bits() > MaxAnycastPrefix {
|
||||
return Addresses{}, fmt.Errorf("cidr %q is too small for a vxlan subnet, at most /%d", cidr, MaxAnycastPrefix)
|
||||
}
|
||||
broadcast := broadcastOf(prefix)
|
||||
gateway := broadcast.Prev()
|
||||
return Addresses{
|
||||
Prefix: prefix,
|
||||
Network: prefix.Addr(),
|
||||
Broadcast: broadcast,
|
||||
Gateway: gateway,
|
||||
Relay: gateway.Prev(),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func CheckHostAddress(cidr, ip string, reserved ...string) error {
|
||||
prefix, err := netip.ParsePrefix(cidr)
|
||||
if err != nil || !prefix.Addr().Is4() {
|
||||
return fmt.Errorf("invalid ipv4 cidr %q", cidr)
|
||||
}
|
||||
prefix = prefix.Masked()
|
||||
addr, err := netip.ParseAddr(ip)
|
||||
if err != nil {
|
||||
return fmt.Errorf("invalid ip %q", ip)
|
||||
}
|
||||
if !prefix.Contains(addr) {
|
||||
return fmt.Errorf("ip %s is outside %s", addr, prefix)
|
||||
}
|
||||
if prefix.Bits() < 31 {
|
||||
if addr == prefix.Addr() {
|
||||
return fmt.Errorf("ip %s is the network address of %s", addr, prefix)
|
||||
}
|
||||
if addr == broadcastOf(prefix) {
|
||||
return fmt.Errorf("ip %s is the broadcast address of %s", addr, prefix)
|
||||
}
|
||||
}
|
||||
for _, r := range reserved {
|
||||
if r == "" {
|
||||
continue
|
||||
}
|
||||
if other, err := netip.ParseAddr(r); err == nil && other == addr {
|
||||
return fmt.Errorf("ip %s is reserved by the subnet", addr)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
146
internal/subnet/addressing_test.go
Normal file
146
internal/subnet/addressing_test.go
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
package subnet
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestAnycastAddresses_Slash24(t *testing.T) {
|
||||
a, err := AnycastAddresses("10.0.0.0/24")
|
||||
if err != nil {
|
||||
t.Fatalf("AnycastAddresses a échoué : %v", err)
|
||||
}
|
||||
for label, c := range map[string][2]string{
|
||||
"network": {"10.0.0.0", a.Network.String()},
|
||||
"broadcast": {"10.0.0.255", a.Broadcast.String()},
|
||||
"gateway": {"10.0.0.254", a.Gateway.String()},
|
||||
"relay": {"10.0.0.253", a.Relay.String()},
|
||||
} {
|
||||
if c[0] != c[1] {
|
||||
t.Errorf("%s attendu %s, obtenu %s", label, c[0], c[1])
|
||||
}
|
||||
}
|
||||
if a.Prefix.String() != "10.0.0.0/24" {
|
||||
t.Errorf("prefix attendu 10.0.0.0/24, obtenu %s", a.Prefix)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAnycastAddresses_Slash16(t *testing.T) {
|
||||
a, err := AnycastAddresses("172.16.0.0/16")
|
||||
if err != nil {
|
||||
t.Fatalf("AnycastAddresses a échoué : %v", err)
|
||||
}
|
||||
if a.Broadcast.String() != "172.16.255.255" {
|
||||
t.Errorf("broadcast attendu 172.16.255.255, obtenu %s", a.Broadcast)
|
||||
}
|
||||
if a.Gateway.String() != "172.16.255.254" {
|
||||
t.Errorf("gateway attendue 172.16.255.254, obtenu %s", a.Gateway)
|
||||
}
|
||||
if a.Relay.String() != "172.16.255.253" {
|
||||
t.Errorf("relay attendu 172.16.255.253, obtenu %s", a.Relay)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAnycastAddresses_Slash29IsTheSmallestAccepted(t *testing.T) {
|
||||
a, err := AnycastAddresses("192.168.1.8/29")
|
||||
if err != nil {
|
||||
t.Fatalf("un /29 doit être accepté : %v", err)
|
||||
}
|
||||
if a.Gateway.String() != "192.168.1.14" {
|
||||
t.Errorf("gateway attendue 192.168.1.14, obtenu %s", a.Gateway)
|
||||
}
|
||||
if a.Relay.String() != "192.168.1.13" {
|
||||
t.Errorf("relay attendu 192.168.1.13, obtenu %s", a.Relay)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAnycastAddresses_Refused(t *testing.T) {
|
||||
cases := map[string]struct {
|
||||
cidr string
|
||||
want string
|
||||
}{
|
||||
"/30 trop petit": {"10.0.0.0/30", "too small"},
|
||||
"bits d'hôte": {"10.0.0.1/24", "host bits"},
|
||||
"ipv6": {"fd00::/64", "not ipv4"},
|
||||
"cidr illisible": {"pas-un-cidr", "invalid cidr"},
|
||||
"adresse sans prefix": {"10.0.0.0", "invalid cidr"},
|
||||
}
|
||||
for label, c := range cases {
|
||||
_, err := AnycastAddresses(c.cidr)
|
||||
if err == nil {
|
||||
t.Errorf("%s : %q devrait être refusé", label, c.cidr)
|
||||
continue
|
||||
}
|
||||
if !strings.Contains(err.Error(), c.want) {
|
||||
t.Errorf("%s : erreur attendue contenant %q, obtenu %v", label, c.want, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCheckHostAddress_ValidHost(t *testing.T) {
|
||||
if err := CheckHostAddress("10.0.0.0/24", "10.0.0.5", "10.0.0.254", "10.0.0.253"); err != nil {
|
||||
t.Errorf("10.0.0.5 devrait être accepté : %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCheckHostAddress_Refused(t *testing.T) {
|
||||
cases := map[string]struct {
|
||||
ip string
|
||||
want string
|
||||
}{
|
||||
"hors cidr": {"10.0.1.5", "outside"},
|
||||
"adresse réseau": {"10.0.0.0", "network address"},
|
||||
"adresse broadcast": {"10.0.0.255", "broadcast address"},
|
||||
"passerelle réservée": {"10.0.0.254", "reserved"},
|
||||
"relais réservé": {"10.0.0.253", "reserved"},
|
||||
"ip illisible": {"10.0.0", "invalid ip"},
|
||||
"ipv6": {"fd00::5", "outside"},
|
||||
}
|
||||
for label, c := range cases {
|
||||
err := CheckHostAddress("10.0.0.0/24", c.ip, "10.0.0.254", "10.0.0.253")
|
||||
if err == nil {
|
||||
t.Errorf("%s : %s devrait être refusé", label, c.ip)
|
||||
continue
|
||||
}
|
||||
if !strings.Contains(err.Error(), c.want) {
|
||||
t.Errorf("%s : erreur attendue contenant %q, obtenu %v", label, c.want, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCheckHostAddress_EmptyReservedIgnored(t *testing.T) {
|
||||
if err := CheckHostAddress("10.0.0.0/24", "10.0.0.5", "", ""); err != nil {
|
||||
t.Errorf("des réservations vides ne doivent rien bloquer : %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCheckHostAddress_LenientCIDRWithHostBits(t *testing.T) {
|
||||
if err := CheckHostAddress("10.0.0.1/24", "10.0.0.5"); err != nil {
|
||||
t.Errorf("un cidr avec bits d'hôte doit être normalisé : %v", err)
|
||||
}
|
||||
if err := CheckHostAddress("10.0.0.1/24", "10.0.0.0"); err == nil {
|
||||
t.Error("l'adresse réseau du cidr normalisé doit rester refusée")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCheckHostAddress_Slash31And32HaveNoNetworkOrBroadcast(t *testing.T) {
|
||||
for _, ip := range []string{"10.0.0.0", "10.0.0.1"} {
|
||||
if err := CheckHostAddress("10.0.0.0/31", ip); err != nil {
|
||||
t.Errorf("/31 : %s devrait être accepté : %v", ip, err)
|
||||
}
|
||||
}
|
||||
if err := CheckHostAddress("10.0.0.7/32", "10.0.0.7"); err != nil {
|
||||
t.Errorf("/32 : 10.0.0.7 devrait être accepté : %v", err)
|
||||
}
|
||||
if err := CheckHostAddress("10.0.0.7/32", "10.0.0.8"); err == nil {
|
||||
t.Error("/32 : 10.0.0.8 est hors du cidr et devrait être refusé")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCheckHostAddress_InvalidCIDR(t *testing.T) {
|
||||
for _, cidr := range []string{"", "pas-un-cidr", "fd00::/64"} {
|
||||
if err := CheckHostAddress(cidr, "10.0.0.5"); err == nil {
|
||||
t.Errorf("cidr %q devrait être refusé", cidr)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue