From 12d69798fbc7f7af466323d837ff3354617c8c9d Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Tue, 13 Oct 2026 14:51:40 +0200 Subject: [PATCH] =?UTF-8?q?f-57:=20dhcp:=20=C3=A9coute=20sur=20le=20macvla?= =?UTF-8?q?n=20de=20la=20gateway=20anycast,=20dnsmasq=20et=20serveur=20int?= =?UTF-8?q?=C3=A9gr=C3=A9=20#57?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GnomeZworc --- cmd/dhcp/listen_test.go | 32 ++++++++++++++++++++++++++++ cmd/dhcp/main.go | 24 ++++++++++++++++++--- internal/dhcp/dhcp_test.go | 24 +++++++++++++++++++++ internal/dhcp/generate.go | 6 ++++++ internal/dhcp/struct.go | 2 ++ internal/dhcpbackend/backend.go | 1 + internal/dhcpbackend/dnsmasq.go | 7 +++++- internal/dhcpbackend/dnsmasq_test.go | 19 +++++++++++++++++ internal/subnet/create.go | 5 +++++ 9 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 cmd/dhcp/listen_test.go diff --git a/cmd/dhcp/listen_test.go b/cmd/dhcp/listen_test.go new file mode 100644 index 0000000..a7be0f7 --- /dev/null +++ b/cmd/dhcp/listen_test.go @@ -0,0 +1,32 @@ +package main + +import "testing" + +func TestListenInterface(t *testing.T) { + present := func(names ...string) func(string) bool { + return func(name string) bool { + for _, n := range names { + if n == name { + return true + } + } + return false + } + } + cases := []struct { + label string + bridge string + exists func(string) bool + want string + }{ + {"gateway anycast présente", "br-s9r1", present("br-s9r1", "gw-s9r1"), "gw-s9r1"}, + {"ancien modèle, pas de gateway", "br-s9r1", present("br-s9r1"), "br-s9r1"}, + {"gateway d'un autre subnet", "br-s9r1", present("br-s9r1", "gw-s9r2"), "br-s9r1"}, + {"bridge sans préfixe br-", "vpc1br0", present("gw-vpc1br0"), "vpc1br0"}, + } + for _, c := range cases { + if got := listenInterface(c.bridge, c.exists); got != c.want { + t.Errorf("%s : %s, %s attendu", c.label, got, c.want) + } + } +} diff --git a/cmd/dhcp/main.go b/cmd/dhcp/main.go index ab5b7fb..59059d9 100644 --- a/cmd/dhcp/main.go +++ b/cmd/dhcp/main.go @@ -5,6 +5,7 @@ import ( "fmt" "net" "os" + "strings" dhcpapi "git.g3e.fr/syonad/two/internal/api/dhcp" configuration "git.g3e.fr/syonad/two/internal/config/agent" @@ -66,13 +67,30 @@ func run() error { } }() - conn, err := server4.NewIPv4UDPConn(*iface, &net.UDPAddr{Port: dhcpv4.ServerPort}) + listen := listenInterface(*iface, interfaceExists) + conn, err := server4.NewIPv4UDPConn(listen, &net.UDPAddr{Port: dhcpv4.ServerPort}) if err != nil { - return fmt.Errorf("bind udp/%d on %s: %w", dhcpv4.ServerPort, *iface, err) + return fmt.Errorf("bind udp/%d on %s: %w", dhcpv4.ServerPort, listen, err) } defer conn.Close() - log.Info("dhcp server started", "state", store.Path(), "socket", control.Addr()) + log.Info("dhcp server started", "listen", listen, "state", store.Path(), "socket", control.Addr()) return store.Serve(conn, log) } + +func interfaceExists(name string) bool { + _, err := net.InterfaceByName(name) + return err == nil +} + +func listenInterface(bridge string, exists func(string) bool) string { + id, ok := strings.CutPrefix(bridge, "br-") + if !ok { + return bridge + } + if gateway := "gw-" + id; exists(gateway) { + return gateway + } + return bridge +} diff --git a/internal/dhcp/dhcp_test.go b/internal/dhcp/dhcp_test.go index 1fd3731..79448b3 100644 --- a/internal/dhcp/dhcp_test.go +++ b/internal/dhcp/dhcp_test.go @@ -316,3 +316,27 @@ func TestGenerateConfig_MissingInterfaceIPIsAnError(t *testing.T) { t.Error("sans interface_ip aucune route metadata n'est possible : il faut échouer, pas écrire une conf muette") } } + +func TestGenerateConfig_ListensOnTheAnycastGateway(t *testing.T) { + conf := newConf(t, "192.168.1.0/29") + conf.Listen = "gw-s9r1" + conf.Except = "br-s9r1" + path, _, _ := GenerateConfig(conf) + content, _ := os.ReadFile(path) + + for _, line := range []string{"\ninterface=gw-s9r1\n", "\nexcept-interface=br-s9r1\n"} { + if !strings.Contains(string(content), line) { + t.Errorf("%q absente du fichier généré :\n%s", strings.TrimSpace(line), content) + } + } +} + +func TestGenerateConfig_NoInterfaceLinesByDefault(t *testing.T) { + conf := newConf(t, "192.168.1.0/29") + path, _, _ := GenerateConfig(conf) + content, _ := os.ReadFile(path) + + if strings.Contains(string(content), "interface=") { + t.Errorf("aucune directive d'interface attendue sans Listen :\n%s", content) + } +} diff --git a/internal/dhcp/generate.go b/internal/dhcp/generate.go index 0e5833e..f67b27f 100644 --- a/internal/dhcp/generate.go +++ b/internal/dhcp/generate.go @@ -18,6 +18,12 @@ func GenerateConfig(c Config) (string, map[string]string, error) { var sb strings.Builder fmt.Fprintf(&sb, "no-resolv\n") + if c.Listen != "" { + fmt.Fprintf(&sb, "interface=%s\n", c.Listen) + } + if c.Except != "" { + fmt.Fprintf(&sb, "except-interface=%s\n", c.Except) + } fmt.Fprintf(&sb, "dhcp-range=%s,static,%s,12h\n", c.Network.IP.String(), mask) fmt.Fprintf(&sb, "dhcp-option=121,%s\n", strings.Join(classlessRoutes(c), ",")) if c.DefaultGateway != nil { diff --git a/internal/dhcp/struct.go b/internal/dhcp/struct.go index 9df7c1f..44d51a7 100644 --- a/internal/dhcp/struct.go +++ b/internal/dhcp/struct.go @@ -13,4 +13,6 @@ type Config struct { DefaultGateway net.IP // if non-nil, default route via option 3 and 0.0.0.0/0 in option 121 Name string ConfDir string + Listen string + Except string } diff --git a/internal/dhcpbackend/backend.go b/internal/dhcpbackend/backend.go index 3c9c909..9d61510 100644 --- a/internal/dhcpbackend/backend.go +++ b/internal/dhcpbackend/backend.go @@ -11,6 +11,7 @@ type Subnet struct { Name string VPC string Bridge string + Listen string Network *net.IPNet InterfaceIP net.IP VPCRoute *net.IPNet diff --git a/internal/dhcpbackend/dnsmasq.go b/internal/dhcpbackend/dnsmasq.go index 207ecee..9244ebf 100644 --- a/internal/dhcpbackend/dnsmasq.go +++ b/internal/dhcpbackend/dnsmasq.go @@ -28,7 +28,7 @@ func (Dnsmasq) Unit(s Subnet) string { } func (b Dnsmasq) config(s Subnet) dhcp.Config { - return dhcp.Config{ + c := dhcp.Config{ Network: s.Network, Name: s.Instance(), ConfDir: b.confDir(), @@ -36,6 +36,11 @@ func (b Dnsmasq) config(s Subnet) dhcp.Config { VPCRoute: s.VPCRoute, DefaultGateway: s.DefaultGateway, } + if s.Listen != "" && s.Listen != s.Bridge { + c.Listen = s.Listen + c.Except = s.Bridge + } + return c } func (b Dnsmasq) ConfigureSubnet(s Subnet) error { diff --git a/internal/dhcpbackend/dnsmasq_test.go b/internal/dhcpbackend/dnsmasq_test.go index 1bb2d7c..4f2a69a 100644 --- a/internal/dhcpbackend/dnsmasq_test.go +++ b/internal/dhcpbackend/dnsmasq_test.go @@ -111,3 +111,22 @@ func TestDnsmasqSetVM_RejectsAVMWithoutReservation(t *testing.T) { t.Fatal("a vm with no reservation would get no address: that must be reported") } } + +func TestDnsmasqConfig_ListenOnGatewayExcludesTheBridge(t *testing.T) { + c := Dnsmasq{}.config(Subnet{VPC: "vp-s9", Bridge: "br-s9r1", Listen: "gw-s9r1"}) + if c.Listen != "gw-s9r1" || c.Except != "br-s9r1" { + t.Errorf("Listen %q, Except %q : gw-s9r1 et br-s9r1 attendus", c.Listen, c.Except) + } + if c.Name != "vp-s9_br-s9r1" { + t.Errorf("instance %q : le nom doit rester celui du bridge", c.Name) + } +} + +func TestDnsmasqConfig_NoListenKeepsTheCommandLineInterface(t *testing.T) { + for _, listen := range []string{"", "br-s9r1"} { + c := Dnsmasq{}.config(Subnet{VPC: "vp-s9", Bridge: "br-s9r1", Listen: listen}) + if c.Listen != "" || c.Except != "" { + t.Errorf("Listen=%q : Listen %q, Except %q, vides attendus", listen, c.Listen, c.Except) + } + } +} diff --git a/internal/subnet/create.go b/internal/subnet/create.go index 6857678..8de1169 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -175,10 +175,15 @@ func startDHCP(db *badger.DB, subnetName string, d subnetData, backend dhcpbacke return fmt.Errorf("store dhcp entries: %w", err) } + listen := "" + if d.anycast() { + listen = d.gatewayLink() + } return backend.ConfigureSubnet(dhcpbackend.Subnet{ Name: subnetName, VPC: d.vpc, Bridge: d.bridge, + Listen: listen, Network: d.cidr, InterfaceIP: d.interfaceIP, VPCRoute: vpcRoute,