f-42: natgw: face publique, routes et NAT de la passerelle sur l'hôte #42

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-29 20:18:38 +01:00
commit 4aec9927ad
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
5 changed files with 440 additions and 0 deletions

View file

@ -24,6 +24,10 @@ func WithdrawDefault(db *badger.DB, vpcName string) error {
return withdrawDefault(newSystem(), db, vpcName)
}
func NetnsDefaultToVRF(db *badger.DB, vpcName string) error {
return netnsDefaultToVRF(newSystem(), db, vpcName)
}
func loadRouted(db *badger.DB, vpcName string) (l3VPC, bool, error) {
parts := strings.SplitN(vpcName, "-", 2)
if len(parts) != 2 {
@ -89,3 +93,14 @@ func withdrawDefault(h host, db *badger.DB, vpcName string) error {
}
return nil
}
func netnsDefaultToVRF(h host, db *badger.DB, vpcName string) error {
v, err := loadRequired(db, vpcName)
if err != nil {
return err
}
if err := h.RouteVia(v.netns, defaultRoute, transitHost.IP, v.vethNetns()); err != nil {
return fmt.Errorf("default route of %s towards %s: %w", v.netns, v.vrf(), err)
}
return nil
}

View file

@ -134,3 +134,22 @@ func TestDefaultRouteErrorsArePropagated(t *testing.T) {
t.Errorf("withdraw : %v", err)
}
}
func TestNetnsDefaultToVRFPointsTheNetnsDefaultAtTheVRF(t *testing.T) {
f := &fakeHost{}
if err := netnsDefaultToVRF(f, routedDB(t), "vp-s7"); err != nil {
t.Fatal(err)
}
want := []string{"route [vp-s7] 0.0.0.0/0 via 169.254.0.1 dev l3-s7-i"}
if !reflect.DeepEqual(f.calls, want) {
t.Errorf("appels %q, attendu %q", f.calls, want)
}
}
func TestNetnsDefaultToVRFRefusesAVPCWithoutL3VNI(t *testing.T) {
f := &fakeHost{}
err := netnsDefaultToVRF(f, routedDB(t), "vp-flat")
if err == nil || !strings.Contains(err.Error(), `vpc "vp-flat" has no l3vni`) || len(f.calls) != 0 {
t.Errorf("erreur %v, appels %q", err, f.calls)
}
}

85
internal/natgw/host.go Normal file
View file

@ -0,0 +1,85 @@
package natgw
import (
"net"
"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/sysctl"
"github.com/dgraph-io/badger/v4"
)
type host interface {
CreateMacvlan(ns, name, parent string, mac net.HardwareAddr) error
BridgeAddLocalMAC(ns, bridge string, mac net.HardwareAddr) error
BridgeDelLocalMAC(ns, bridge string, mac net.HardwareAddr) error
Sysctl(ns, key, value string) error
AddrAdd(ns, iface string, prefix *net.IPNet) error
LinkUp(ns, iface string) error
DefaultVia(ns string, gw net.IP, iface string) error
SetNAT(ns string, g nft.NATGateway) error
DeleteNAT(ns, iface string) error
DeleteLink(ns, name string) error
ExportDefault(vpc string) error
WithdrawDefault(vpc string) error
NetnsDefaultToVRF(vpc string) error
}
var defaultRoute = &net.IPNet{IP: net.IPv4zero.To4(), Mask: net.CIDRMask(0, 32)}
type system struct {
db *badger.DB
}
func newSystem(db *badger.DB) system {
return system{db: db}
}
func (system) CreateMacvlan(ns, name, parent string, mac net.HardwareAddr) error {
return netns.Call(ns, func() error { return netif.CreateMacvlan(name, parent, mac) })
}
func (system) BridgeAddLocalMAC(ns, bridge string, mac net.HardwareAddr) error {
return netns.Call(ns, func() error { return netif.BridgeAddLocalMAC(bridge, mac) })
}
func (system) BridgeDelLocalMAC(ns, bridge string, mac net.HardwareAddr) error {
return netns.Call(ns, func() error { return netif.BridgeDelLocalMACIfExists(bridge, mac) })
}
func (system) Sysctl(ns, key, value string) error {
return netns.Call(ns, func() error { return sysctl.Set(key, value) })
}
func (system) AddrAdd(ns, iface string, prefix *net.IPNet) error {
return netns.Call(ns, func() error { return netif.AddrAddPrefix(iface, prefix) })
}
func (system) LinkUp(ns, iface string) error {
return netns.Call(ns, func() error { return netif.LinkSetUp(iface) })
}
func (system) DefaultVia(ns string, gw net.IP, iface string) error {
return netns.Call(ns, func() error { return netif.RouteReplaceVia(0, defaultRoute, gw, iface) })
}
func (system) SetNAT(ns string, g nft.NATGateway) error {
return netns.Call(ns, func() error { return nft.SetNATGateway(g) })
}
func (system) DeleteNAT(ns, iface string) error {
return netns.Call(ns, func() error { return nft.DeleteNATGateway(iface) })
}
func (system) DeleteLink(ns, name string) error {
return netns.Call(ns, func() error { return netif.DeleteLinkIfExists(name) })
}
func (s system) ExportDefault(vpc string) error { return l3vni.ExportDefault(s.db, vpc) }
func (s system) WithdrawDefault(vpc string) error { return l3vni.WithdrawDefault(s.db, vpc) }
func (s system) NetnsDefaultToVRF(vpc string) error { return l3vni.NetnsDefaultToVRF(s.db, vpc) }

119
internal/natgw/natgw.go Normal file
View file

@ -0,0 +1,119 @@
package natgw
import (
"fmt"
"net"
"strings"
"git.g3e.fr/syonad/two/internal/l3vni"
"git.g3e.fr/syonad/two/internal/netif"
"git.g3e.fr/syonad/two/internal/nft"
"github.com/dgraph-io/badger/v4"
)
const publicBridge = "br-public"
type gateway struct {
vpc string
iface string
mac net.HardwareAddr
ip *net.IPNet
gateway net.IP
}
func Iface(vpcName string) (string, error) {
parts := strings.SplitN(vpcName, "-", 2)
if len(parts) != 2 {
return "", fmt.Errorf("invalid vpc name %q", vpcName)
}
return "ng-" + parts[1], nil
}
func load(db *badger.DB, vpcName string) (gateway, error) {
r, ok, err := l3vni.LoadRouting(db, vpcName)
if err != nil {
return gateway{}, err
}
if !ok {
return gateway{}, fmt.Errorf("vpc %q has no l3vni", vpcName)
}
iface, err := Iface(vpcName)
if err != nil {
return gateway{}, err
}
mac, err := netif.NATGatewayMAC(int(r.VNI))
if err != nil {
return gateway{}, err
}
return gateway{vpc: vpcName, iface: iface, mac: mac}, nil
}
func Create(db *badger.DB, vpcName string, ip *net.IPNet, gw net.IP) error {
g, err := load(db, vpcName)
if err != nil {
return err
}
g.ip, g.gateway = ip, gw
return create(newSystem(db), g)
}
func Delete(db *badger.DB, vpcName string) error {
g, err := load(db, vpcName)
if err != nil {
return err
}
return remove(newSystem(db), g)
}
type step struct {
what string
run func() error
}
func runSteps(g gateway, steps []step) error {
for _, s := range steps {
if err := s.run(); err != nil {
return fmt.Errorf("nat gateway of %s: %s: %w", g.vpc, s.what, err)
}
}
return nil
}
func sysctls(iface string) [][2]string {
return [][2]string{
{"net.ipv4.conf." + iface + ".arp_ignore", "1"},
{"net.ipv4.conf." + iface + ".arp_announce", "2"},
{"net.ipv4.conf." + iface + ".arp_notify", "1"},
}
}
func create(h host, g gateway) error {
ns := g.vpc
steps := []step{
{"create " + g.iface, func() error { return h.CreateMacvlan(ns, g.iface, publicBridge, g.mac) }},
{"local fdb entry " + g.mac.String(), func() error { return h.BridgeAddLocalMAC(ns, publicBridge, g.mac) }},
}
for _, kv := range sysctls(g.iface) {
steps = append(steps, step{kv[0], func() error { return h.Sysctl(ns, kv[0], kv[1]) }})
}
steps = append(steps,
step{"address " + g.ip.String(), func() error { return h.AddrAdd(ns, g.iface, g.ip) }},
step{"set up " + g.iface, func() error { return h.LinkUp(ns, g.iface) }},
step{"default route via " + g.gateway.String(), func() error { return h.DefaultVia(ns, g.gateway, g.iface) }},
step{"nat rules", func() error { return h.SetNAT(ns, nft.NATGateway{Iface: g.iface, IP: g.ip.IP.String()}) }},
step{"export default", func() error { return h.ExportDefault(g.vpc) }},
)
return runSteps(g, steps)
}
func remove(h host, g gateway) error {
ns := g.vpc
return runSteps(g, []step{
{"withdraw default", func() error { return h.WithdrawDefault(g.vpc) }},
{"nat rules", func() error { return h.DeleteNAT(ns, g.iface) }},
{"default route towards the vrf", func() error { return h.NetnsDefaultToVRF(g.vpc) }},
{"local fdb entry " + g.mac.String(), func() error { return h.BridgeDelLocalMAC(ns, publicBridge, g.mac) }},
{"delete " + g.iface, func() error { return h.DeleteLink(ns, g.iface) }},
})
}

View file

@ -0,0 +1,202 @@
package natgw
import (
"errors"
"fmt"
"net"
"reflect"
"strings"
"testing"
"git.g3e.fr/syonad/two/internal/nft"
"git.g3e.fr/syonad/two/pkg/db/kv"
)
type fakeHost struct {
calls []string
fail map[string]error
}
func (f *fakeHost) record(call string) error {
f.calls = append(f.calls, call)
for prefix, err := range f.fail {
if strings.HasPrefix(call, prefix) {
return err
}
}
return nil
}
func (f *fakeHost) CreateMacvlan(ns, name, parent string, mac net.HardwareAddr) error {
return f.record(fmt.Sprintf("macvlan [%s] %s parent %s mac %s", ns, name, parent, mac))
}
func (f *fakeHost) BridgeAddLocalMAC(ns, bridge string, mac net.HardwareAddr) error {
return f.record(fmt.Sprintf("fdb add [%s] %s %s", ns, bridge, mac))
}
func (f *fakeHost) BridgeDelLocalMAC(ns, bridge string, mac net.HardwareAddr) error {
return f.record(fmt.Sprintf("fdb del [%s] %s %s", ns, bridge, mac))
}
func (f *fakeHost) Sysctl(ns, key, value string) error {
return f.record(fmt.Sprintf("sysctl [%s] %s=%s", ns, key, value))
}
func (f *fakeHost) AddrAdd(ns, iface string, prefix *net.IPNet) error {
return f.record(fmt.Sprintf("addr [%s] %s %s", ns, iface, prefix))
}
func (f *fakeHost) LinkUp(ns, iface string) error {
return f.record(fmt.Sprintf("up [%s] %s", ns, iface))
}
func (f *fakeHost) DefaultVia(ns string, gw net.IP, iface string) error {
return f.record(fmt.Sprintf("default [%s] via %s dev %s", ns, gw, iface))
}
func (f *fakeHost) SetNAT(ns string, g nft.NATGateway) error {
return f.record(fmt.Sprintf("nat set [%s] %s %s", ns, g.Iface, g.IP))
}
func (f *fakeHost) DeleteNAT(ns, iface string) error {
return f.record(fmt.Sprintf("nat del [%s] %s", ns, iface))
}
func (f *fakeHost) DeleteLink(ns, name string) error {
return f.record(fmt.Sprintf("del [%s] %s", ns, name))
}
func (f *fakeHost) ExportDefault(vpc string) error {
return f.record("export default " + vpc)
}
func (f *fakeHost) WithdrawDefault(vpc string) error {
return f.record("withdraw default " + vpc)
}
func (f *fakeHost) NetnsDefaultToVRF(vpc string) error {
return f.record("netns default to vrf " + vpc)
}
func labGateway(t *testing.T) gateway {
t.Helper()
ip, prefix, err := net.ParseCIDR("198.51.100.50/24")
if err != nil {
t.Fatal(err)
}
prefix.IP = ip
mac, err := net.ParseMAC("02:04:00:00:0a:8c")
if err != nil {
t.Fatal(err)
}
return gateway{vpc: "vp-s7", iface: "ng-s7", mac: mac, ip: prefix, gateway: net.ParseIP("198.51.100.1")}
}
func TestCreateBuildsThePublicFaceThenTheRoutesThenTheNAT(t *testing.T) {
f := &fakeHost{}
if err := create(f, labGateway(t)); err != nil {
t.Fatal(err)
}
want := []string{
"macvlan [vp-s7] ng-s7 parent br-public mac 02:04:00:00:0a:8c",
"fdb add [vp-s7] br-public 02:04:00:00:0a:8c",
"sysctl [vp-s7] net.ipv4.conf.ng-s7.arp_ignore=1",
"sysctl [vp-s7] net.ipv4.conf.ng-s7.arp_announce=2",
"sysctl [vp-s7] net.ipv4.conf.ng-s7.arp_notify=1",
"addr [vp-s7] ng-s7 198.51.100.50/24",
"up [vp-s7] ng-s7",
"default [vp-s7] via 198.51.100.1 dev ng-s7",
"nat set [vp-s7] ng-s7 198.51.100.50",
"export default vp-s7",
}
if !reflect.DeepEqual(f.calls, want) {
t.Errorf("appels :\n%s\nattendu :\n%s", strings.Join(f.calls, "\n"), strings.Join(want, "\n"))
}
}
func TestCreateStopsAtTheFirstFailure(t *testing.T) {
f := &fakeHost{fail: map[string]error{"default ": errors.New("network unreachable")}}
err := create(f, labGateway(t))
if err == nil || !strings.Contains(err.Error(), "nat gateway of vp-s7: default route via 198.51.100.1: network unreachable") {
t.Fatalf("erreur %v", err)
}
for _, c := range f.calls {
if strings.HasPrefix(c, "nat ") || strings.HasPrefix(c, "export ") {
t.Errorf("étape exécutée après l'échec : %q", c)
}
}
}
func TestCreateExportsTheDefaultOnlyOnceTheNATIsInPlace(t *testing.T) {
f := &fakeHost{fail: map[string]error{"nat set ": errors.New("nft absent")}}
if err := create(f, labGateway(t)); err == nil {
t.Fatal("erreur attendue")
}
for _, c := range f.calls {
if strings.HasPrefix(c, "export ") {
t.Errorf("route par défaut annoncée sans NAT : %q", c)
}
}
}
func TestRemoveWithdrawsTheDefaultFirstThenUndoesTheHost(t *testing.T) {
f := &fakeHost{}
if err := remove(f, labGateway(t)); err != nil {
t.Fatal(err)
}
want := []string{
"withdraw default vp-s7",
"nat del [vp-s7] ng-s7",
"netns default to vrf vp-s7",
"fdb del [vp-s7] br-public 02:04:00:00:0a:8c",
"del [vp-s7] ng-s7",
}
if !reflect.DeepEqual(f.calls, want) {
t.Errorf("appels :\n%s\nattendu :\n%s", strings.Join(f.calls, "\n"), strings.Join(want, "\n"))
}
}
func TestRemoveKeepsTheHostWhenTheDefaultCannotBeWithdrawn(t *testing.T) {
f := &fakeHost{fail: map[string]error{"withdraw ": errors.New("no such table")}}
err := remove(f, labGateway(t))
if err == nil || !strings.Contains(err.Error(), "withdraw default: no such table") {
t.Fatalf("erreur %v", err)
}
if len(f.calls) != 1 {
t.Errorf("appels après l'échec : %q", f.calls)
}
}
func TestIface(t *testing.T) {
got, err := Iface("vp-s7")
if err != nil || got != "ng-s7" {
t.Errorf("%q, %v ; ng-s7 attendu", got, err)
}
if _, err := Iface("nodash"); err == nil {
t.Error("nom de VPC sans tiret accepté")
}
}
func TestLoadDerivesTheMACFromTheL3VNI(t *testing.T) {
db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
t.Cleanup(func() { db.Close() })
kv.AddInDB(db, "vpc/vp-s7/cidr", "10.241.0.0/16")
kv.AddInDB(db, "vpc/vp-s7/l3vni", "2700")
g, err := load(db, "vp-s7")
if err != nil {
t.Fatal(err)
}
if g.vpc != "vp-s7" || g.iface != "ng-s7" || g.mac.String() != "02:04:00:00:0a:8c" {
t.Errorf("passerelle %+v", g)
}
}
func TestLoadRefusesAVPCWithoutL3VNI(t *testing.T) {
db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
t.Cleanup(func() { db.Close() })
kv.AddInDB(db, "vpc/vp-flat/cidr", "10.242.0.0/16")
if _, err := load(db, "vp-flat"); err == nil || !strings.Contains(err.Error(), `vpc "vp-flat" has no l3vni`) {
t.Errorf("erreur %v", err)
}
}