f-86: agent: dummy, DNAT et open par VPC, DHCP 6 et 42, watchdog #86

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-25 20:45:24 +01:00
commit 27dda545cf
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
16 changed files with 565 additions and 13 deletions

View file

@ -53,6 +53,9 @@ func CreateVPC(db *badger.DB, name string, cfg *configuration.Config) error {
if err := l3vni.Create(db, name, cfg); err != nil {
return err
}
if err := setupHostSvc(name, newSystemHostSvc()); err != nil {
return err
}
return state.Set(db, "vpc/"+name, state.Running)
}
return nil

View file

@ -17,6 +17,10 @@ func DeleteVPC(db *badger.DB, name string) error {
} else if current == state.Deleting {
vpcID := strings.SplitN(name, "-", 2)[1]
if err := teardownHostSvc(name, newSystemHostSvc()); err != nil {
return err
}
if err := l3vni.Delete(db, name); err != nil {
return err
}

72
internal/vpc/hostsvc.go Normal file
View file

@ -0,0 +1,72 @@
package vpc
import (
"fmt"
"net"
hostsvcapi "git.g3e.fr/syonad/two/internal/api/hostsvc"
hostsvcclient "git.g3e.fr/syonad/two/internal/client/hostsvc"
"git.g3e.fr/syonad/two/internal/hostsvc"
"git.g3e.fr/syonad/two/internal/iptables"
"git.g3e.fr/syonad/two/internal/netif"
"git.g3e.fr/syonad/two/internal/netns"
)
const HostSvcLink = "hostsvc"
type hostSvcHost interface {
InNetns(vpc string, fn func() error) error
CreateDummy(name string) error
AddrAdd(iface string, ip net.IP) error
AddRedirect(target string) error
Open(vpc string) error
Close(vpc string) error
}
type systemHostSvc struct {
client *hostsvcclient.Client
}
func newSystemHostSvc() systemHostSvc {
return systemHostSvc{client: hostsvcclient.New(hostsvcapi.SocketPath(hostsvcapi.DefaultRunDir))}
}
func (systemHostSvc) InNetns(vpc string, fn func() error) error { return netns.Call(vpc, fn) }
func (systemHostSvc) CreateDummy(name string) error { return netif.CreateDummy(name) }
func (systemHostSvc) AddrAdd(iface string, ip net.IP) error { return netif.AddrAdd(iface, ip) }
func (systemHostSvc) AddRedirect(target string) error { return iptables.AddHostSvcRedirect(target) }
func (s systemHostSvc) Open(vpc string) error { return s.client.Open(vpc) }
func (s systemHostSvc) Close(vpc string) error { return s.client.Close(vpc) }
func setupHostSvc(vpc string, h hostSvcHost) error {
ip := net.ParseIP(hostsvc.ServiceIP)
if err := h.InNetns(vpc, func() error {
steps := []struct {
name string
fn func() error
}{
{"create " + HostSvcLink, func() error { return h.CreateDummy(HostSvcLink) }},
{"address " + hostsvc.ServiceIP + " on " + HostSvcLink, func() error { return h.AddrAdd(HostSvcLink, ip) }},
{"redirect dns and ntp to " + hostsvc.ServiceIP, func() error { return h.AddRedirect(hostsvc.ServiceIP) }},
}
for _, step := range steps {
if err := step.fn(); err != nil {
return fmt.Errorf("%s: %w", step.name, err)
}
}
return nil
}); err != nil {
return fmt.Errorf("hostsvc in %s: %w", vpc, err)
}
if err := h.Open(vpc); err != nil {
return fmt.Errorf("hostsvc open %s: %w", vpc, err)
}
return nil
}
func teardownHostSvc(vpc string, h hostSvcHost) error {
if err := h.Close(vpc); err != nil {
return fmt.Errorf("hostsvc close %s: %w", vpc, err)
}
return nil
}

View file

@ -0,0 +1,92 @@
package vpc
import (
"errors"
"net"
"reflect"
"testing"
)
type fakeHostSvc struct {
calls []string
inside string
failOn string
}
func (f *fakeHostSvc) record(kind, detail string) error {
call := kind + " " + detail
if f.inside != "" {
call = f.inside + ": " + call
}
f.calls = append(f.calls, call)
if kind == f.failOn {
return errors.New("boom")
}
return nil
}
func (f *fakeHostSvc) InNetns(vpc string, fn func() error) error {
f.inside = vpc
defer func() { f.inside = "" }()
return fn()
}
func (f *fakeHostSvc) CreateDummy(name string) error { return f.record("dummy", name) }
func (f *fakeHostSvc) AddrAdd(iface string, ip net.IP) error {
return f.record("addr", ip.String()+" "+iface)
}
func (f *fakeHostSvc) AddRedirect(target string) error { return f.record("redirect", target) }
func (f *fakeHostSvc) Open(vpc string) error { return f.record("open", vpc) }
func (f *fakeHostSvc) Close(vpc string) error { return f.record("close", vpc) }
func TestSetupHostSvc_OrderAndPlace(t *testing.T) {
f := &fakeHostSvc{}
if err := setupHostSvc("vpc-00001", f); err != nil {
t.Fatalf("setupHostSvc: %v", err)
}
want := []string{
"vpc-00001: dummy hostsvc",
"vpc-00001: addr 169.254.169.253 hostsvc",
"vpc-00001: redirect 169.254.169.253",
"open vpc-00001",
}
if !reflect.DeepEqual(f.calls, want) {
t.Errorf("calls = %v, want %v: the address and the redirection live in the vpc netns, the open is asked from the host once they exist", f.calls, want)
}
}
func TestSetupHostSvc_StopsAtTheFirstFailure(t *testing.T) {
for _, c := range []struct {
failOn string
want string
last string
}{
{"dummy", "hostsvc in vpc-00001: create hostsvc: boom", "vpc-00001: dummy hostsvc"},
{"addr", "hostsvc in vpc-00001: address 169.254.169.253 on hostsvc: boom", "vpc-00001: addr 169.254.169.253 hostsvc"},
{"redirect", "hostsvc in vpc-00001: redirect dns and ntp to 169.254.169.253: boom", "vpc-00001: redirect 169.254.169.253"},
{"open", "hostsvc open vpc-00001: boom", "open vpc-00001"},
} {
f := &fakeHostSvc{failOn: c.failOn}
err := setupHostSvc("vpc-00001", f)
if err == nil || err.Error() != c.want {
t.Errorf("fail on %s: error %v, want %q", c.failOn, err, c.want)
}
if got := f.calls[len(f.calls)-1]; got != c.last {
t.Errorf("fail on %s: last call %q, want %q: nothing must run after a failure", c.failOn, got, c.last)
}
}
}
func TestTeardownHostSvc(t *testing.T) {
f := &fakeHostSvc{}
if err := teardownHostSvc("vpc-00001", f); err != nil {
t.Fatalf("teardownHostSvc: %v", err)
}
if !reflect.DeepEqual(f.calls, []string{"close vpc-00001"}) {
t.Errorf("calls = %v: only the close is needed, the dummy and the rules go away with the netns", f.calls)
}
f = &fakeHostSvc{failOn: "close"}
if err := teardownHostSvc("vpc-00001", f); err == nil || err.Error() != "hostsvc close vpc-00001: boom" {
t.Errorf("error %v: a failed close must stop the deletion", err)
}
}