f-76: vm: filtrage nftables par tap, champ dhcp_server, watchdog #76
Chaque NIC a sa chaîne pre-tap<id>, posée avant le tap et retirée après : MAC, ARP et IPv4 source limités à ceux de la NIC (0.0.0.0 pour le client DHCP et la sonde ARP), réponses DHCP refusées sauf si dhcp_server, seuls IPv4, ARP et IPv6 émis. Le watchdog vérifie la chaîne de chaque NIC. Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
d98e42e0a8
commit
74bfda7004
16 changed files with 295 additions and 15 deletions
|
|
@ -15,6 +15,7 @@ import (
|
|||
"git.g3e.fr/syonad/two/internal/metadata"
|
||||
"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/qemu"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
|
||||
|
|
@ -41,6 +42,17 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error {
|
|||
return err
|
||||
}
|
||||
|
||||
if err := netns.Call(nic.vpcName, func() error {
|
||||
for _, n := range d.nics {
|
||||
if err := nft.SetPort(n.tapPort()); err != nil {
|
||||
return fmt.Errorf("interface %d: %w", n.index, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}); err != nil {
|
||||
return fmt.Errorf("filter taps: %w", err)
|
||||
}
|
||||
|
||||
for _, n := range d.nics {
|
||||
if err := netif.CreateTap(n.tapID, n.bridge, n.vpcName, cfg.Network.VM()); err != nil {
|
||||
return fmt.Errorf("create tap of interface %d: %w", n.index, err)
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ type nicData struct {
|
|||
mac string
|
||||
tapID int
|
||||
primary bool
|
||||
dhcpServer bool
|
||||
mode string
|
||||
vpcCIDR *net.IPNet
|
||||
}
|
||||
|
|
@ -179,6 +180,7 @@ func loadNIC(db *badger.DB, name string, idx int, entries map[string]string) (ni
|
|||
}
|
||||
n.bridge = "br-" + strings.SplitN(n.subnetName, "-", 2)[1]
|
||||
n.primary = entries[prefix+"primary"] == "true"
|
||||
n.dhcpServer = entries[prefix+"dhcp_server"] == "true"
|
||||
|
||||
vpcName, err := kv.GetFromDB(db, "subnet/"+n.subnetName+"/vpc")
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -125,6 +125,23 @@ func TestLoadVM_SingleNIC(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestLoadVM_ReadsDHCPServer(t *testing.T) {
|
||||
db := newVMInDB(t)
|
||||
addNIC(t, db, 1, "sn-000002", "10.2.0.5", "00:22:33:00:02:05", false)
|
||||
kv.AddInDB(db, "vm/vm-1/nic/1/dhcp_server", "true")
|
||||
|
||||
d, err := loadVM(db, "vm-1")
|
||||
if err != nil {
|
||||
t.Fatalf("loadVM : %v", err)
|
||||
}
|
||||
if len(d.nics) != 2 {
|
||||
t.Fatalf("2 interfaces attendues, obtenu %d", len(d.nics))
|
||||
}
|
||||
if d.nics[0].dhcpServer || !d.nics[1].dhcpServer {
|
||||
t.Errorf("dhcp_server attendu sur l'index 1 seulement : %+v", d.nics)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadVM_MultipleNICsSortedByIndex(t *testing.T) {
|
||||
db := newVMInDB(t)
|
||||
addNIC(t, db, 2, "sn-000003", "10.3.0.9", "00:22:33:00:03:09", false)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import (
|
|||
"git.g3e.fr/syonad/two/internal/metadata"
|
||||
"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/qmp"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
|
||||
|
|
@ -79,6 +80,17 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error {
|
|||
}
|
||||
}
|
||||
|
||||
if err := netns.Call(nic.vpcName, func() error {
|
||||
for _, n := range d.nics {
|
||||
if err := nft.DeletePort(n.tapPort().Name); err != nil {
|
||||
return fmt.Errorf("interface %d: %w", n.index, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}); err != nil {
|
||||
return fmt.Errorf("unfilter taps: %w", err)
|
||||
}
|
||||
|
||||
if err := removeDHCPFiles(d, name, backend); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
28
internal/vm/filter.go
Normal file
28
internal/vm/filter.go
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
package vm
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"git.g3e.fr/syonad/two/internal/nft"
|
||||
)
|
||||
|
||||
func TapPort(tapID int, mac, ip string, dhcpServer bool) nft.Port {
|
||||
mac = strings.ToLower(mac)
|
||||
rules := []string{
|
||||
nft.DropSourceMACOtherThan(mac),
|
||||
nft.DropEtherTypesOtherThanIPAndARP(),
|
||||
nft.DropARPSenderMACOtherThan(mac),
|
||||
nft.DropARPSenderIPOtherThan(ip),
|
||||
nft.DropIPSourceOtherThan(ip),
|
||||
}
|
||||
rules = append(rules, nft.DropUnspecifiedSourceOutsideDHCP()...)
|
||||
if !dhcpServer {
|
||||
rules = append(rules, nft.DropDHCPServer())
|
||||
}
|
||||
return nft.Port{Name: fmt.Sprintf("tap%d", tapID), Prerouting: rules}
|
||||
}
|
||||
|
||||
func (n nicData) tapPort() nft.Port {
|
||||
return TapPort(n.tapID, n.mac, n.ip, n.dhcpServer)
|
||||
}
|
||||
53
internal/vm/filter_test.go
Normal file
53
internal/vm/filter_test.go
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
package vm
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestTapPortFiltersEverythingTheVMMustNotSend(t *testing.T) {
|
||||
p := TapPort(12345678, "52:54:00:00:0A:05", "10.0.0.5", false)
|
||||
if p.Name != "tap12345678" {
|
||||
t.Errorf("port %q, tap12345678 attendu", p.Name)
|
||||
}
|
||||
want := []string{
|
||||
"ether saddr != 52:54:00:00:0a:05 drop",
|
||||
"ether type != { ip, arp, ip6 } drop",
|
||||
"arp saddr ether != 52:54:00:00:0a:05 drop",
|
||||
"arp saddr ip != { 0.0.0.0, 10.0.0.5 } drop",
|
||||
"ip saddr != { 0.0.0.0, 10.0.0.5 } drop",
|
||||
"ip saddr 0.0.0.0 ip protocol != udp drop",
|
||||
"ip saddr 0.0.0.0 udp dport != 67 drop",
|
||||
"udp sport 67 drop",
|
||||
}
|
||||
if strings.Join(p.Prerouting, "\n") != strings.Join(want, "\n") {
|
||||
t.Errorf("règles :\n%s\nattendues :\n%s", strings.Join(p.Prerouting, "\n"), strings.Join(want, "\n"))
|
||||
}
|
||||
if len(p.Forward) != 0 || len(p.Output) != 0 {
|
||||
t.Errorf("seul ce qu'émet la VM est filtré : forward %q, output %q", p.Forward, p.Output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTapPortLetsAnAuthorizedNICAnswerDHCP(t *testing.T) {
|
||||
allowed := TapPort(12345678, "52:54:00:00:0a:05", "10.0.0.5", true)
|
||||
denied := TapPort(12345678, "52:54:00:00:0a:05", "10.0.0.5", false)
|
||||
for _, r := range allowed.Prerouting {
|
||||
if r == "udp sport 67 drop" {
|
||||
t.Errorf("la NIC autorisée garde le blocage du serveur DHCP")
|
||||
}
|
||||
}
|
||||
if len(allowed.Prerouting) != len(denied.Prerouting)-1 {
|
||||
t.Errorf("seul le blocage du serveur DHCP doit disparaître : %q", allowed.Prerouting)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNICTapPortUsesItsOwnData(t *testing.T) {
|
||||
n := nicData{tapID: 87654321, mac: "52:54:00:00:0b:07", ip: "10.0.1.7", dhcpServer: true}
|
||||
p := n.tapPort()
|
||||
if p.Name != "tap87654321" || p.Prerouting[0] != "ether saddr != 52:54:00:00:0b:07 drop" || p.Prerouting[3] != "arp saddr ip != { 0.0.0.0, 10.0.1.7 } drop" {
|
||||
t.Errorf("port %+v", p)
|
||||
}
|
||||
if strings.Contains(strings.Join(p.Prerouting, "|"), "udp sport 67 drop") {
|
||||
t.Errorf("dhcpServer de la NIC ignoré")
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue