f-76: nft: règles de pont en nftables, ebtables retiré #76

internal/nft pose les règles d'un port en une transaction, dans une table
bridge two par netns de VPC. Subnets, gateway anycast et watchdog l'utilisent,
même filtrage qu'avec ebtables. bootstrap_kvm.sh et le lab installent
nftables ; helpers e2e, doc et notes 0.3.0 suivent.

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-25 22:39:36 +01:00
commit d98e42e0a8
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
27 changed files with 823 additions and 341 deletions

View file

@ -3,11 +3,10 @@ package subnet
import (
"errors"
"fmt"
"net"
"git.g3e.fr/syonad/two/internal/ebtables"
"git.g3e.fr/syonad/two/internal/netif"
"git.g3e.fr/syonad/two/internal/netns"
"git.g3e.fr/syonad/two/internal/nft"
"git.g3e.fr/syonad/two/internal/sysctl"
)
@ -32,7 +31,9 @@ func setupAnycastGateway(d subnetData, vethI string) error {
name string
fn func() error
}{
{"confine " + mac.String(), func() error { return ebtables.ConfineMAC(vethI, mac.String()) }},
{"filter " + vethI, func() error {
return nft.SetPort(AnycastFabricPort(vethI, mac.String(), d.interfaceIP.String(), d.relayIP.String()))
}},
{"arp sysctls on " + d.bridge, func() error { return setSysctls(arpSysctls(d.bridge)) }},
{"relay address on " + d.bridge, func() error { return netif.AddrAdd(d.bridge, d.relayIP) }},
{"create " + gw, func() error { return netif.CreateMacvlan(gw, d.bridge, mac) }},
@ -41,10 +42,6 @@ func setupAnycastGateway(d subnetData, vethI string) error {
{"gateway address on " + gw, func() error { return netif.AddrAdd(gw, d.interfaceIP) }},
{"route " + d.cidr.String(), func() error { return netif.RouteAddFrom(d.bridge, d.cidr, d.interfaceIP) }},
{"set up " + gw, func() error { return netif.LinkSetUp(gw) }},
{"drop arp to gateway", func() error { return ebtables.DropARPToGateway(vethI, d.interfaceIP.String()) }},
{"drop arp to relay", func() error { return ebtables.DropARPToGateway(vethI, d.relayIP.String()) }},
{"drop dhcp from gateway", func() error { return ebtables.DropDHCP(vethI, d.interfaceIP.String()) }},
{"drop dhcp from relay", func() error { return ebtables.DropDHCP(vethI, d.relayIP.String()) }},
}
return netns.Call(d.vpc, func() error {
for _, step := range steps {
@ -57,21 +54,9 @@ func setupAnycastGateway(d subnetData, vethI string) error {
}
func deleteAnycastGateway(d subnetData, vethI string) error {
mac, err := netif.AnycastMAC(d.vxlanID)
if err != nil {
return err
}
return netns.Call(d.vpc, func() error {
var errs []error
for _, ip := range []net.IP{d.interfaceIP, d.relayIP} {
if err := ebtables.DeleteARPToGateway(vethI, ip.String()); err != nil {
errs = append(errs, fmt.Errorf("delete ebtables arp rule %s: %w", ip, err))
}
if err := ebtables.DeleteDHCP(vethI, ip.String()); err != nil {
errs = append(errs, fmt.Errorf("delete ebtables dhcp rule %s: %w", ip, err))
}
}
if err := ebtables.DeleteConfineMAC(vethI, mac.String()); err != nil {
if err := nft.DeletePort(vethI); err != nil {
errs = append(errs, err)
}
if err := netif.DeleteLink(d.gatewayLink()); err != nil {

View file

@ -6,10 +6,10 @@ import (
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/internal/dhcpbackend"
"git.g3e.fr/syonad/two/internal/ebtables"
"git.g3e.fr/syonad/two/internal/l3vni"
"git.g3e.fr/syonad/two/internal/netif"
"git.g3e.fr/syonad/two/internal/netns"
"git.g3e.fr/syonad/two/internal/nft"
"git.g3e.fr/syonad/two/internal/state"
"github.com/dgraph-io/badger/v4"
@ -118,10 +118,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
if err := netif.RouteAdd(d.bridge, d.cidr); err != nil {
return fmt.Errorf("add route: %w", err)
}
if err := ebtables.DropARPToGateway(vethI, d.interfaceIP.String()); err != nil {
return err
}
return ebtables.DropDHCP(vethI, d.interfaceIP.String())
return nft.SetPort(VxlanFabricPort(vethI, d.interfaceIP.String()))
}); err != nil {
return fmt.Errorf("configure netns: %w", err)
}
@ -133,7 +130,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
if err := netif.RouteAdd(d.bridge, d.cidr); err != nil {
return fmt.Errorf("add route: %w", err)
}
return ebtables.ConfineGateway(vethI, d.interfaceIP.String())
return nft.SetPort(BridgeFabricPort(vethI, d.interfaceIP.String()))
}); err != nil {
return fmt.Errorf("configure netns: %w", err)
}

View file

@ -5,10 +5,10 @@ import (
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/internal/dhcpbackend"
"git.g3e.fr/syonad/two/internal/ebtables"
"git.g3e.fr/syonad/two/internal/l3vni"
"git.g3e.fr/syonad/two/internal/netif"
"git.g3e.fr/syonad/two/internal/netns"
"git.g3e.fr/syonad/two/internal/nft"
"git.g3e.fr/syonad/two/internal/state"
"github.com/dgraph-io/badger/v4"
@ -76,11 +76,8 @@ func deleteSubnetVxlan(d subnetData) error {
return fmt.Errorf("delete netns resources: %w", err)
}
} else if err := netns.Call(d.vpc, func() error {
if err := ebtables.DeleteARPToGateway(vethI, d.interfaceIP.String()); err != nil {
return fmt.Errorf("delete ebtables arp rule: %w", err)
}
if err := ebtables.DeleteDHCP(vethI, d.interfaceIP.String()); err != nil {
return fmt.Errorf("delete ebtables dhcp rule: %w", err)
if err := nft.DeletePort(vethI); err != nil {
return err
}
return netif.DeleteLink(d.bridge)
}); err != nil {
@ -105,8 +102,8 @@ func deleteSubnetBridge(d subnetData) error {
vethI := "v-" + d.subnetID + "-i"
if err := netns.Call(d.vpc, func() error {
if err := ebtables.DeleteConfineGateway(vethI, d.interfaceIP.String()); err != nil {
return fmt.Errorf("delete ebtables gateway rules: %w", err)
if err := nft.DeletePort(vethI); err != nil {
return err
}
return netif.DeleteLink(d.bridge)
}); err != nil {

35
internal/subnet/fabric.go Normal file
View file

@ -0,0 +1,35 @@
package subnet
import (
"git.g3e.fr/syonad/two/internal/nft"
)
func VxlanFabricPort(vethI, gatewayIP string) nft.Port {
return nft.Port{
Name: vethI,
Forward: []string{nft.DropARPRequestTo(gatewayIP), nft.DropDHCPFrom(gatewayIP)},
}
}
func AnycastFabricPort(vethI, mac, gatewayIP, relayIP string) nft.Port {
return nft.Port{
Name: vethI,
Prerouting: []string{nft.DropSourceMAC(mac)},
Forward: []string{
nft.DropSourceMAC(mac),
nft.DropARPRequestTo(gatewayIP),
nft.DropARPRequestTo(relayIP),
nft.DropDHCPFrom(gatewayIP),
nft.DropDHCPFrom(relayIP),
},
Output: []string{nft.DropSourceMAC(mac)},
}
}
func BridgeFabricPort(vethI, gatewayIP string) nft.Port {
return nft.Port{
Name: vethI,
Forward: []string{nft.DropARPRequestTo(gatewayIP), nft.DropDHCPFrom(gatewayIP)},
Output: []string{nft.DropARPFrom(gatewayIP), nft.DropDHCPFrom(gatewayIP)},
}
}

View file

@ -0,0 +1,52 @@
package subnet
import (
"strings"
"testing"
)
func assertRules(t *testing.T, hook string, got, want []string) {
t.Helper()
if strings.Join(got, "\n") != strings.Join(want, "\n") {
t.Errorf("%s : %q, %q attendu", hook, got, want)
}
}
func TestVxlanFabricPort(t *testing.T) {
p := VxlanFabricPort("v-s9r1-i", "10.9.1.254")
if p.Name != "v-s9r1-i" {
t.Errorf("port %q", p.Name)
}
assertRules(t, "prerouting", p.Prerouting, nil)
assertRules(t, "forward", p.Forward, []string{
"arp operation request arp daddr ip 10.9.1.254 drop",
"ip saddr 10.9.1.254 udp sport 67-68 udp dport 67-68 drop",
})
assertRules(t, "output", p.Output, nil)
}
func TestAnycastFabricPort(t *testing.T) {
p := AnycastFabricPort("v-s9r1-i", "02:01:00:00:0b:5f", "10.9.1.254", "10.9.1.253")
assertRules(t, "prerouting", p.Prerouting, []string{"ether saddr 02:01:00:00:0b:5f drop"})
assertRules(t, "forward", p.Forward, []string{
"ether saddr 02:01:00:00:0b:5f drop",
"arp operation request arp daddr ip 10.9.1.254 drop",
"arp operation request arp daddr ip 10.9.1.253 drop",
"ip saddr 10.9.1.254 udp sport 67-68 udp dport 67-68 drop",
"ip saddr 10.9.1.253 udp sport 67-68 udp dport 67-68 drop",
})
assertRules(t, "output", p.Output, []string{"ether saddr 02:01:00:00:0b:5f drop"})
}
func TestBridgeFabricPort(t *testing.T) {
p := BridgeFabricPort("v-t33a-i", "10.33.0.1")
assertRules(t, "prerouting", p.Prerouting, nil)
assertRules(t, "forward", p.Forward, []string{
"arp operation request arp daddr ip 10.33.0.1 drop",
"ip saddr 10.33.0.1 udp sport 67-68 udp dport 67-68 drop",
})
assertRules(t, "output", p.Output, []string{
"arp saddr ip 10.33.0.1 drop",
"ip saddr 10.33.0.1 udp sport 67-68 udp dport 67-68 drop",
})
}