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:
parent
da6295baf1
commit
d98e42e0a8
27 changed files with 823 additions and 341 deletions
|
|
@ -1,153 +0,0 @@
|
|||
package ebtables
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func addRule(args ...string) error {
|
||||
return exec.Command("ebtables", append([]string{"-A"}, args...)...).Run()
|
||||
}
|
||||
|
||||
func deleteRule(args ...string) error {
|
||||
return exec.Command("ebtables", append([]string{"-D"}, args...)...).Run()
|
||||
}
|
||||
|
||||
func DropARPToGateway(iface, ip string) error {
|
||||
if err := addRule("FORWARD",
|
||||
"--out-interface", iface,
|
||||
"-p", "arp",
|
||||
"--arp-op", "Request",
|
||||
"--arp-ip-dst", ip,
|
||||
"-j", "DROP"); err != nil {
|
||||
return fmt.Errorf("ebtables arp rule: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func DropDHCP(iface, ip string) error {
|
||||
if err := addRule("FORWARD",
|
||||
"--out-interface", iface,
|
||||
"-p", "IPv4",
|
||||
"--ip-protocol", "udp",
|
||||
"--ip-source-port", "67:68",
|
||||
"--ip-destination-port", "67:68",
|
||||
"--ip-source", ip,
|
||||
"-j", "DROP"); err != nil {
|
||||
return fmt.Errorf("ebtables dhcp rule: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteARPToGateway(iface, ip string) error {
|
||||
return deleteRule("FORWARD",
|
||||
"--out-interface", iface,
|
||||
"-p", "arp",
|
||||
"--arp-op", "Request",
|
||||
"--arp-ip-dst", ip,
|
||||
"-j", "DROP")
|
||||
}
|
||||
|
||||
func DeleteDHCP(iface, ip string) error {
|
||||
return deleteRule("FORWARD",
|
||||
"--out-interface", iface,
|
||||
"-p", "IPv4",
|
||||
"--ip-protocol", "udp",
|
||||
"--ip-source-port", "67:68",
|
||||
"--ip-destination-port", "67:68",
|
||||
"--ip-source", ip,
|
||||
"-j", "DROP")
|
||||
}
|
||||
|
||||
func confineRules(iface, mac string) [][]string {
|
||||
return [][]string{
|
||||
{"-t", "nat", "PREROUTING", "--in-interface", iface, "-s", mac, "-j", "DROP"},
|
||||
{"-t", "filter", "FORWARD", "--out-interface", iface, "-s", mac, "-j", "DROP"},
|
||||
{"-t", "filter", "OUTPUT", "--out-interface", iface, "-s", mac, "-j", "DROP"},
|
||||
}
|
||||
}
|
||||
|
||||
func withAction(action string, rule []string) []string {
|
||||
return append([]string{rule[0], rule[1], action}, rule[2:]...)
|
||||
}
|
||||
|
||||
func ConfineMAC(iface, mac string) error {
|
||||
for _, rule := range confineRules(iface, mac) {
|
||||
if err := exec.Command("ebtables", withAction("-A", rule)...).Run(); err != nil {
|
||||
return fmt.Errorf("ebtables confine %s on %s (%s %s): %w", mac, iface, rule[1], rule[2], err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteConfineMAC(iface, mac string) error {
|
||||
var first error
|
||||
for _, rule := range confineRules(iface, mac) {
|
||||
if err := exec.Command("ebtables", withAction("-D", rule)...).Run(); err != nil && first == nil {
|
||||
first = fmt.Errorf("ebtables unconfine %s on %s (%s %s): %w", mac, iface, rule[1], rule[2], err)
|
||||
}
|
||||
}
|
||||
return first
|
||||
}
|
||||
|
||||
func gatewayRules(iface, ip string) [][]string {
|
||||
dhcp := []string{"-p", "IPv4", "--ip-protocol", "udp", "--ip-source-port", "67:68", "--ip-destination-port", "67:68", "--ip-source", ip, "-j", "DROP"}
|
||||
return [][]string{
|
||||
{"-t", "filter", "FORWARD", "--out-interface", iface, "-p", "arp", "--arp-op", "Request", "--arp-ip-dst", ip, "-j", "DROP"},
|
||||
{"-t", "filter", "OUTPUT", "--out-interface", iface, "-p", "arp", "--arp-ip-src", ip, "-j", "DROP"},
|
||||
append([]string{"-t", "filter", "FORWARD", "--out-interface", iface}, dhcp...),
|
||||
append([]string{"-t", "filter", "OUTPUT", "--out-interface", iface}, dhcp...),
|
||||
}
|
||||
}
|
||||
|
||||
func ruleExists(rule []string) (bool, error) {
|
||||
err := exec.Command("ebtables", withAction("--check", rule)...).Run()
|
||||
var exit *exec.ExitError
|
||||
switch {
|
||||
case err == nil:
|
||||
return true, nil
|
||||
case errors.As(err, &exit) && exit.ExitCode() == 1:
|
||||
return false, nil
|
||||
default:
|
||||
return false, fmt.Errorf("ebtables --check %s: %w", strings.Join(rule, " "), err)
|
||||
}
|
||||
}
|
||||
|
||||
func ConfineGateway(iface, ip string) error {
|
||||
for _, rule := range gatewayRules(iface, ip) {
|
||||
if err := exec.Command("ebtables", withAction("-A", rule)...).Run(); err != nil {
|
||||
return fmt.Errorf("ebtables confine gateway %s on %s (%s): %w", ip, iface, strings.Join(rule, " "), err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteConfineGateway(iface, ip string) error {
|
||||
var first error
|
||||
for _, rule := range gatewayRules(iface, ip) {
|
||||
exists, err := ruleExists(rule)
|
||||
if err == nil && exists {
|
||||
err = exec.Command("ebtables", withAction("-D", rule)...).Run()
|
||||
}
|
||||
if err != nil && first == nil {
|
||||
first = fmt.Errorf("ebtables unconfine gateway %s on %s (%s): %w", ip, iface, strings.Join(rule, " "), err)
|
||||
}
|
||||
}
|
||||
return first
|
||||
}
|
||||
|
||||
func MissingGatewayRules(iface, ip string) ([]string, error) {
|
||||
var missing []string
|
||||
for _, rule := range gatewayRules(iface, ip) {
|
||||
exists, err := ruleExists(rule)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !exists {
|
||||
missing = append(missing, strings.Join(rule, " "))
|
||||
}
|
||||
}
|
||||
return missing, nil
|
||||
}
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
package ebtables
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestConfineRules(t *testing.T) {
|
||||
want := []string{
|
||||
"-t nat -A PREROUTING --in-interface v-s9r1-i -s 02:01:00:00:0b:5f -j DROP",
|
||||
"-t filter -A FORWARD --out-interface v-s9r1-i -s 02:01:00:00:0b:5f -j DROP",
|
||||
"-t filter -A OUTPUT --out-interface v-s9r1-i -s 02:01:00:00:0b:5f -j DROP",
|
||||
}
|
||||
rules := confineRules("v-s9r1-i", "02:01:00:00:0b:5f")
|
||||
if len(rules) != len(want) {
|
||||
t.Fatalf("%d règles, %d attendues", len(rules), len(want))
|
||||
}
|
||||
for i, rule := range rules {
|
||||
if got := strings.Join(withAction("-A", rule), " "); got != want[i] {
|
||||
t.Errorf("règle %d : %q, %q attendu", i, got, want[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteUsesTheSameRules(t *testing.T) {
|
||||
for _, rule := range confineRules("v-x-i", "02:01:00:00:00:01") {
|
||||
added := withAction("-A", rule)
|
||||
deleted := withAction("-D", rule)
|
||||
if strings.Replace(strings.Join(added, " "), " -A ", " -D ", 1) != strings.Join(deleted, " ") {
|
||||
t.Errorf("ajout %v et suppression %v divergent", added, deleted)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithActionDoesNotAlterTheRule(t *testing.T) {
|
||||
rule := confineRules("v-x-i", "02:01:00:00:00:01")[0]
|
||||
before := strings.Join(rule, " ")
|
||||
withAction("-A", rule)
|
||||
withAction("-D", rule)
|
||||
if strings.Join(rule, " ") != before {
|
||||
t.Errorf("la règle a été modifiée : %q devenu %q", before, strings.Join(rule, " "))
|
||||
}
|
||||
}
|
||||
|
||||
func TestGatewayRules(t *testing.T) {
|
||||
want := []string{
|
||||
"-t filter -A FORWARD --out-interface v-t33a-i -p arp --arp-op Request --arp-ip-dst 10.33.0.1 -j DROP",
|
||||
"-t filter -A OUTPUT --out-interface v-t33a-i -p arp --arp-ip-src 10.33.0.1 -j DROP",
|
||||
"-t filter -A FORWARD --out-interface v-t33a-i -p IPv4 --ip-protocol udp --ip-source-port 67:68 --ip-destination-port 67:68 --ip-source 10.33.0.1 -j DROP",
|
||||
"-t filter -A OUTPUT --out-interface v-t33a-i -p IPv4 --ip-protocol udp --ip-source-port 67:68 --ip-destination-port 67:68 --ip-source 10.33.0.1 -j DROP",
|
||||
}
|
||||
rules := gatewayRules("v-t33a-i", "10.33.0.1")
|
||||
if len(rules) != len(want) {
|
||||
t.Fatalf("%d règles, %d attendues", len(rules), len(want))
|
||||
}
|
||||
for i, rule := range rules {
|
||||
if got := strings.Join(withAction("-A", rule), " "); got != want[i] {
|
||||
t.Errorf("règle %d : %q, %q attendu", i, got, want[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestGatewayRulesDoNotShareSlices(t *testing.T) {
|
||||
rules := gatewayRules("v-x-i", "10.0.0.1")
|
||||
before := strings.Join(rules[2], " ")
|
||||
rules[3][len(rules[3])-1] = "ACCEPT"
|
||||
if strings.Join(rules[2], " ") != before {
|
||||
t.Errorf("les deux règles DHCP partagent leur tableau : %q", strings.Join(rules[2], " "))
|
||||
}
|
||||
}
|
||||
353
internal/nft/nft.go
Normal file
353
internal/nft/nft.go
Normal file
|
|
@ -0,0 +1,353 @@
|
|||
package nft
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"strings"
|
||||
)
|
||||
|
||||
const Table = "two"
|
||||
|
||||
type hook struct {
|
||||
name string
|
||||
chain string
|
||||
prefix string
|
||||
ports string
|
||||
key string
|
||||
priority string
|
||||
}
|
||||
|
||||
var hooks = []hook{
|
||||
{"prerouting", "prerouting", "pre-", "pre_ports", "iifname", "dstnat"},
|
||||
{"forward", "forward", "fwd-", "fwd_ports", "oifname", "filter"},
|
||||
{"output", "output", "out-", "out_ports", "oifname", "filter"},
|
||||
}
|
||||
|
||||
type Port struct {
|
||||
Name string
|
||||
Prerouting []string
|
||||
Forward []string
|
||||
Output []string
|
||||
}
|
||||
|
||||
func (p Port) rules(h hook) []string {
|
||||
switch h.name {
|
||||
case "prerouting":
|
||||
return p.Prerouting
|
||||
case "forward":
|
||||
return p.Forward
|
||||
default:
|
||||
return p.Output
|
||||
}
|
||||
}
|
||||
|
||||
func DropSourceMAC(mac string) string {
|
||||
return "ether saddr " + mac + " drop"
|
||||
}
|
||||
|
||||
func DropARPRequestTo(ip string) string {
|
||||
return "arp operation request arp daddr ip " + ip + " drop"
|
||||
}
|
||||
|
||||
func DropARPFrom(ip string) string {
|
||||
return "arp saddr ip " + ip + " drop"
|
||||
}
|
||||
|
||||
func DropDHCPFrom(ip string) string {
|
||||
return "ip saddr " + ip + " udp sport 67-68 udp dport 67-68 drop"
|
||||
}
|
||||
|
||||
func run(args []string, script string) ([]byte, error) {
|
||||
cmd := exec.Command("nft", args...)
|
||||
if script != "" {
|
||||
cmd.Stdin = strings.NewReader(script)
|
||||
}
|
||||
var stderr bytes.Buffer
|
||||
cmd.Stderr = &stderr
|
||||
out, err := cmd.Output()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("nft %s: %w: %s", strings.Join(args, " "), err, strings.TrimSpace(stderr.String()))
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func apply(script string) error {
|
||||
_, err := run([]string{"-f", "-"}, script)
|
||||
return err
|
||||
}
|
||||
|
||||
func baseScript() string {
|
||||
var b strings.Builder
|
||||
fmt.Fprintf(&b, "add table bridge %s\n", Table)
|
||||
for _, h := range hooks {
|
||||
fmt.Fprintf(&b, "add map bridge %s %s { type ifname : verdict; }\n", Table, h.ports)
|
||||
}
|
||||
for _, h := range hooks {
|
||||
fmt.Fprintf(&b, "add chain bridge %s %s { type filter hook %s priority %s; policy accept; }\n", Table, h.chain, h.name, h.priority)
|
||||
}
|
||||
return b.String()
|
||||
}
|
||||
|
||||
func setScript(p Port, base table) string {
|
||||
var b strings.Builder
|
||||
b.WriteString(baseScript())
|
||||
for _, h := range hooks {
|
||||
if !base.hasDispatch(h) {
|
||||
fmt.Fprintf(&b, "add rule bridge %s %s %s vmap @%s\n", Table, h.chain, h.key, h.ports)
|
||||
}
|
||||
}
|
||||
for _, h := range hooks {
|
||||
rules := p.rules(h)
|
||||
chain := h.prefix + p.Name
|
||||
if len(rules) == 0 {
|
||||
if _, ok := base.elements[h.ports][p.Name]; ok {
|
||||
fmt.Fprintf(&b, "delete element bridge %s %s { %q }\n", Table, h.ports, p.Name)
|
||||
}
|
||||
if base.chains[chain] {
|
||||
fmt.Fprintf(&b, "delete chain bridge %s %s\n", Table, chain)
|
||||
}
|
||||
continue
|
||||
}
|
||||
fmt.Fprintf(&b, "add chain bridge %s %s\n", Table, chain)
|
||||
fmt.Fprintf(&b, "flush chain bridge %s %s\n", Table, chain)
|
||||
for _, r := range rules {
|
||||
fmt.Fprintf(&b, "add rule bridge %s %s %s\n", Table, chain, r)
|
||||
}
|
||||
target, ok := base.elements[h.ports][p.Name]
|
||||
if ok && target != chain {
|
||||
fmt.Fprintf(&b, "delete element bridge %s %s { %q }\n", Table, h.ports, p.Name)
|
||||
}
|
||||
if target != chain {
|
||||
fmt.Fprintf(&b, "add element bridge %s %s { %q : jump %s }\n", Table, h.ports, p.Name, chain)
|
||||
}
|
||||
}
|
||||
return b.String()
|
||||
}
|
||||
|
||||
func deleteScript(name string, t table) string {
|
||||
var b strings.Builder
|
||||
for _, h := range hooks {
|
||||
if _, ok := t.elements[h.ports][name]; ok {
|
||||
fmt.Fprintf(&b, "delete element bridge %s %s { %q }\n", Table, h.ports, name)
|
||||
}
|
||||
}
|
||||
for _, h := range hooks {
|
||||
if chain := h.prefix + name; t.chains[chain] {
|
||||
fmt.Fprintf(&b, "delete chain bridge %s %s\n", Table, chain)
|
||||
}
|
||||
}
|
||||
return b.String()
|
||||
}
|
||||
|
||||
func SetPort(p Port) error {
|
||||
t, err := readTable()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := apply(setScript(p, t)); err != nil {
|
||||
return fmt.Errorf("set port %s: %w", p.Name, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeletePort(name string) error {
|
||||
t, err := readTable()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
script := deleteScript(name, t)
|
||||
if script == "" {
|
||||
return nil
|
||||
}
|
||||
if err := apply(script); err != nil {
|
||||
return fmt.Errorf("delete port %s: %w", name, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func MissingRules(p Port) ([]string, error) {
|
||||
t, err := readTable()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
listings := map[string][]string{}
|
||||
for _, h := range hooks {
|
||||
chain := h.prefix + p.Name
|
||||
if len(p.rules(h)) == 0 || !t.chains[chain] {
|
||||
continue
|
||||
}
|
||||
out, err := run([]string{"list", "chain", "bridge", Table, chain}, "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
listings[chain] = chainRules(string(out))
|
||||
}
|
||||
return missing(p, t, listings), nil
|
||||
}
|
||||
|
||||
func missing(p Port, t table, listings map[string][]string) []string {
|
||||
var out []string
|
||||
for _, h := range hooks {
|
||||
rules := p.rules(h)
|
||||
if len(rules) == 0 {
|
||||
continue
|
||||
}
|
||||
chain := h.prefix + p.Name
|
||||
if !t.hasDispatch(h) {
|
||||
out = append(out, fmt.Sprintf("%s: %s vmap @%s", h.chain, h.key, h.ports))
|
||||
}
|
||||
if t.elements[h.ports][p.Name] != chain {
|
||||
out = append(out, fmt.Sprintf("%s: %q : jump %s", h.ports, p.Name, chain))
|
||||
}
|
||||
want := map[string]bool{}
|
||||
for _, r := range rules {
|
||||
want[r] = true
|
||||
}
|
||||
have := map[string]bool{}
|
||||
for _, r := range listings[chain] {
|
||||
have[r] = true
|
||||
if !want[r] {
|
||||
out = append(out, chain+": unexpected "+r)
|
||||
}
|
||||
}
|
||||
for _, r := range rules {
|
||||
if !have[r] {
|
||||
out = append(out, chain+": "+r)
|
||||
}
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func chainRules(listing string) []string {
|
||||
var rules []string
|
||||
depth := 0
|
||||
for _, line := range strings.Split(listing, "\n") {
|
||||
line = strings.TrimSpace(line)
|
||||
switch {
|
||||
case strings.HasSuffix(line, "{"):
|
||||
depth++
|
||||
case line == "}":
|
||||
depth--
|
||||
case depth == 2 && line != "":
|
||||
rules = append(rules, line)
|
||||
}
|
||||
}
|
||||
return rules
|
||||
}
|
||||
|
||||
type table struct {
|
||||
exists bool
|
||||
chains map[string]bool
|
||||
elements map[string]map[string]string
|
||||
dispatch map[string]string
|
||||
}
|
||||
|
||||
func (t table) hasDispatch(h hook) bool {
|
||||
return t.dispatch[h.chain] == h.key+" @"+h.ports
|
||||
}
|
||||
|
||||
type listing struct {
|
||||
Nftables []struct {
|
||||
Table *struct {
|
||||
Family string `json:"family"`
|
||||
Name string `json:"name"`
|
||||
} `json:"table"`
|
||||
Chain *struct {
|
||||
Name string `json:"name"`
|
||||
} `json:"chain"`
|
||||
Map *struct {
|
||||
Name string `json:"name"`
|
||||
Elem []json.RawMessage `json:"elem"`
|
||||
} `json:"map"`
|
||||
Rule *struct {
|
||||
Chain string `json:"chain"`
|
||||
Expr []struct {
|
||||
Vmap *struct {
|
||||
Key struct {
|
||||
Meta struct {
|
||||
Key string `json:"key"`
|
||||
} `json:"meta"`
|
||||
} `json:"key"`
|
||||
Data string `json:"data"`
|
||||
} `json:"vmap"`
|
||||
} `json:"expr"`
|
||||
} `json:"rule"`
|
||||
} `json:"nftables"`
|
||||
}
|
||||
|
||||
func readTable() (table, error) {
|
||||
out, err := run([]string{"-j", "list", "tables", "bridge"}, "")
|
||||
if err != nil {
|
||||
return table{}, err
|
||||
}
|
||||
tables, err := parseListing(out)
|
||||
if err != nil || !tables.exists {
|
||||
return tables, err
|
||||
}
|
||||
out, err = run([]string{"-j", "list", "table", "bridge", Table}, "")
|
||||
if err != nil {
|
||||
return table{}, err
|
||||
}
|
||||
return parseListing(out)
|
||||
}
|
||||
|
||||
func parseListing(data []byte) (table, error) {
|
||||
var l listing
|
||||
if err := json.Unmarshal(data, &l); err != nil {
|
||||
return table{}, fmt.Errorf("nft json: %w", err)
|
||||
}
|
||||
t := table{chains: map[string]bool{}, elements: map[string]map[string]string{}, dispatch: map[string]string{}}
|
||||
for _, o := range l.Nftables {
|
||||
switch {
|
||||
case o.Table != nil:
|
||||
if o.Table.Family == "bridge" && o.Table.Name == Table {
|
||||
t.exists = true
|
||||
}
|
||||
case o.Chain != nil:
|
||||
t.chains[o.Chain.Name] = true
|
||||
case o.Map != nil:
|
||||
elems := map[string]string{}
|
||||
for _, raw := range o.Map.Elem {
|
||||
name, target, err := parseElem(raw)
|
||||
if err != nil {
|
||||
return table{}, fmt.Errorf("nft json: map %s: %w", o.Map.Name, err)
|
||||
}
|
||||
elems[name] = target
|
||||
}
|
||||
t.elements[o.Map.Name] = elems
|
||||
case o.Rule != nil:
|
||||
for _, e := range o.Rule.Expr {
|
||||
if e.Vmap != nil {
|
||||
t.dispatch[o.Rule.Chain] = e.Vmap.Key.Meta.Key + " " + e.Vmap.Data
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return t, nil
|
||||
}
|
||||
|
||||
func parseElem(raw json.RawMessage) (string, string, error) {
|
||||
var pair []json.RawMessage
|
||||
if err := json.Unmarshal(raw, &pair); err != nil || len(pair) != 2 {
|
||||
return "", "", fmt.Errorf("element %s: not a key and verdict pair", raw)
|
||||
}
|
||||
var name string
|
||||
if err := json.Unmarshal(pair[0], &name); err != nil {
|
||||
return "", "", fmt.Errorf("element %s: key: %w", raw, err)
|
||||
}
|
||||
var verdict struct {
|
||||
Jump *struct {
|
||||
Target string `json:"target"`
|
||||
} `json:"jump"`
|
||||
}
|
||||
if err := json.Unmarshal(pair[1], &verdict); err != nil {
|
||||
return "", "", fmt.Errorf("element %s: verdict: %w", raw, err)
|
||||
}
|
||||
if verdict.Jump == nil {
|
||||
return name, "", nil
|
||||
}
|
||||
return name, verdict.Jump.Target, nil
|
||||
}
|
||||
217
internal/nft/nft_test.go
Normal file
217
internal/nft/nft_test.go
Normal file
|
|
@ -0,0 +1,217 @@
|
|||
package nft
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
const listedTable = `{"nftables": [{"metainfo": {"version": "1.0.6", "release_name": "Lester Gooch #5", "json_schema_version": 1}}, {"table": {"family": "bridge", "name": "two", "handle": 1}}, {"map": {"family": "bridge", "name": "pre_ports", "table": "two", "type": "ifname", "handle": 1, "map": "verdict"}}, {"map": {"family": "bridge", "name": "fwd_ports", "table": "two", "type": "ifname", "handle": 2, "map": "verdict", "elem": [["v-t33a-i", {"jump": {"target": "fwd-v-t33a-i"}}], ["v-other-i", {"jump": {"target": "fwd-v-other-i"}}]]}}, {"map": {"family": "bridge", "name": "out_ports", "table": "two", "type": "ifname", "handle": 3, "map": "verdict", "elem": [["v-t33a-i", {"jump": {"target": "out-v-t33a-i"}}]]}}, {"chain": {"family": "bridge", "table": "two", "name": "prerouting", "handle": 4, "type": "filter", "hook": "prerouting", "prio": -300, "policy": "accept"}}, {"chain": {"family": "bridge", "table": "two", "name": "forward", "handle": 5, "type": "filter", "hook": "forward", "prio": -200, "policy": "accept"}}, {"chain": {"family": "bridge", "table": "two", "name": "output", "handle": 6, "type": "filter", "hook": "output", "prio": -200, "policy": "accept"}}, {"chain": {"family": "bridge", "table": "two", "name": "fwd-v-t33a-i", "handle": 10}}, {"chain": {"family": "bridge", "table": "two", "name": "out-v-t33a-i", "handle": 11}}, {"chain": {"family": "bridge", "table": "two", "name": "fwd-v-other-i", "handle": 12}}, {"rule": {"family": "bridge", "table": "two", "chain": "prerouting", "handle": 7, "expr": [{"vmap": {"key": {"meta": {"key": "iifname"}}, "data": "@pre_ports"}}]}}, {"rule": {"family": "bridge", "table": "two", "chain": "forward", "handle": 8, "expr": [{"vmap": {"key": {"meta": {"key": "oifname"}}, "data": "@fwd_ports"}}]}}, {"rule": {"family": "bridge", "table": "two", "chain": "output", "handle": 9, "expr": [{"vmap": {"key": {"meta": {"key": "oifname"}}, "data": "@out_ports"}}]}}]}`
|
||||
|
||||
const noTable = `{"nftables": [{"metainfo": {"version": "1.0.6", "release_name": "Lester Gooch #5", "json_schema_version": 1}}]}`
|
||||
|
||||
const listedChain = `table bridge two {
|
||||
chain fwd-v-t33a-i {
|
||||
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
|
||||
}
|
||||
}
|
||||
`
|
||||
|
||||
func bridgePort() Port {
|
||||
return Port{
|
||||
Name: "v-t33a-i",
|
||||
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"},
|
||||
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"},
|
||||
}
|
||||
}
|
||||
|
||||
func mustParse(t *testing.T, data string) table {
|
||||
t.Helper()
|
||||
tb, err := parseListing([]byte(data))
|
||||
if err != nil {
|
||||
t.Fatalf("parseListing: %v", err)
|
||||
}
|
||||
return tb
|
||||
}
|
||||
|
||||
func TestRuleTexts(t *testing.T) {
|
||||
for got, want := range map[string]string{
|
||||
DropSourceMAC("02:01:00:00:0b:5f"): "ether saddr 02:01:00:00:0b:5f drop",
|
||||
DropARPRequestTo("10.33.0.1"): "arp operation request arp daddr ip 10.33.0.1 drop",
|
||||
DropARPFrom("10.33.0.1"): "arp saddr ip 10.33.0.1 drop",
|
||||
DropDHCPFrom("10.33.0.1"): "ip saddr 10.33.0.1 udp sport 67-68 udp dport 67-68 drop",
|
||||
} {
|
||||
if got != want {
|
||||
t.Errorf("%q, %q attendu", got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSetScriptOnAnEmptyNetns(t *testing.T) {
|
||||
want := `add table bridge two
|
||||
add map bridge two pre_ports { type ifname : verdict; }
|
||||
add map bridge two fwd_ports { type ifname : verdict; }
|
||||
add map bridge two out_ports { type ifname : verdict; }
|
||||
add chain bridge two prerouting { type filter hook prerouting priority dstnat; policy accept; }
|
||||
add chain bridge two forward { type filter hook forward priority filter; policy accept; }
|
||||
add chain bridge two output { type filter hook output priority filter; policy accept; }
|
||||
add rule bridge two prerouting iifname vmap @pre_ports
|
||||
add rule bridge two forward oifname vmap @fwd_ports
|
||||
add rule bridge two output oifname vmap @out_ports
|
||||
add chain bridge two fwd-v-t33a-i
|
||||
flush chain bridge two fwd-v-t33a-i
|
||||
add rule bridge two fwd-v-t33a-i arp operation request arp daddr ip 10.33.0.1 drop
|
||||
add rule bridge two fwd-v-t33a-i ip saddr 10.33.0.1 udp sport 67-68 udp dport 67-68 drop
|
||||
add element bridge two fwd_ports { "v-t33a-i" : jump fwd-v-t33a-i }
|
||||
add chain bridge two out-v-t33a-i
|
||||
flush chain bridge two out-v-t33a-i
|
||||
add rule bridge two out-v-t33a-i arp saddr ip 10.33.0.1 drop
|
||||
add rule bridge two out-v-t33a-i ip saddr 10.33.0.1 udp sport 67-68 udp dport 67-68 drop
|
||||
add element bridge two out_ports { "v-t33a-i" : jump out-v-t33a-i }
|
||||
`
|
||||
if got := setScript(bridgePort(), mustParse(t, noTable)); got != want {
|
||||
t.Errorf("script :\n%s\nattendu :\n%s", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSetScriptAgainKeepsDispatchAndElements(t *testing.T) {
|
||||
got := setScript(bridgePort(), mustParse(t, listedTable))
|
||||
for _, absent := range []string{"vmap", "add element", "delete"} {
|
||||
if strings.Contains(got, absent) {
|
||||
t.Errorf("%q présent alors que la table est déjà en place :\n%s", absent, got)
|
||||
}
|
||||
}
|
||||
if !strings.Contains(got, "flush chain bridge two fwd-v-t33a-i\n") {
|
||||
t.Errorf("la chaîne n'est pas vidée avant d'être réécrite :\n%s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSetScriptReplacesAnElementPointingElsewhere(t *testing.T) {
|
||||
data := strings.Replace(listedTable, `["v-t33a-i", {"jump": {"target": "fwd-v-t33a-i"}}]`, `["v-t33a-i", {"jump": {"target": "fwd-v-other-i"}}]`, 1)
|
||||
got := setScript(bridgePort(), mustParse(t, data))
|
||||
want := "delete element bridge two fwd_ports { \"v-t33a-i\" }\nadd element bridge two fwd_ports { \"v-t33a-i\" : jump fwd-v-t33a-i }\n"
|
||||
if !strings.Contains(got, want) {
|
||||
t.Errorf("élément non remplacé :\n%s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSetScriptRemovesAHookThePortNoLongerUses(t *testing.T) {
|
||||
p := bridgePort()
|
||||
p.Output = nil
|
||||
got := setScript(p, mustParse(t, listedTable))
|
||||
want := "delete element bridge two out_ports { \"v-t33a-i\" }\ndelete chain bridge two out-v-t33a-i\n"
|
||||
if !strings.Contains(got, want) {
|
||||
t.Errorf("crochet output non retiré :\n%s", got)
|
||||
}
|
||||
if strings.Contains(got, "pre-v-t33a-i") {
|
||||
t.Errorf("chaîne prerouting touchée alors qu'elle n'existe pas :\n%s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteScriptRemovesElementsBeforeChains(t *testing.T) {
|
||||
want := `delete element bridge two fwd_ports { "v-t33a-i" }
|
||||
delete element bridge two out_ports { "v-t33a-i" }
|
||||
delete chain bridge two fwd-v-t33a-i
|
||||
delete chain bridge two out-v-t33a-i
|
||||
`
|
||||
if got := deleteScript("v-t33a-i", mustParse(t, listedTable)); got != want {
|
||||
t.Errorf("script :\n%s\nattendu :\n%s", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteScriptLeavesOtherPorts(t *testing.T) {
|
||||
got := deleteScript("v-t33a-i", mustParse(t, listedTable))
|
||||
if strings.Contains(got, "v-other-i") {
|
||||
t.Errorf("un autre port est touché :\n%s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteScriptIsEmptyForAnAbsentPort(t *testing.T) {
|
||||
for name, data := range map[string]string{"sans table": noTable, "port inconnu": listedTable} {
|
||||
if got := deleteScript("v-gone-i", mustParse(t, data)); got != "" {
|
||||
t.Errorf("%s : script %q, vide attendu", name, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseListing(t *testing.T) {
|
||||
tb := mustParse(t, listedTable)
|
||||
if !tb.exists {
|
||||
t.Errorf("table two non vue")
|
||||
}
|
||||
if got := tb.elements["fwd_ports"]["v-t33a-i"]; got != "fwd-v-t33a-i" {
|
||||
t.Errorf("fwd_ports[v-t33a-i] = %q", got)
|
||||
}
|
||||
if got := len(tb.elements["pre_ports"]); got != 0 {
|
||||
t.Errorf("pre_ports : %d éléments, 0 attendu", got)
|
||||
}
|
||||
for _, c := range []string{"prerouting", "forward", "output", "fwd-v-t33a-i", "out-v-t33a-i", "fwd-v-other-i"} {
|
||||
if !tb.chains[c] {
|
||||
t.Errorf("chaîne %s non vue", c)
|
||||
}
|
||||
}
|
||||
for _, h := range hooks {
|
||||
if !tb.hasDispatch(h) {
|
||||
t.Errorf("aiguillage de %s non vu : %q", h.chain, tb.dispatch[h.chain])
|
||||
}
|
||||
}
|
||||
if mustParse(t, noTable).exists {
|
||||
t.Errorf("table vue alors qu'absente")
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseListingRejectsAMalformedElement(t *testing.T) {
|
||||
data := strings.Replace(listedTable, `["v-other-i", {"jump": {"target": "fwd-v-other-i"}}]`, `"v-other-i"`, 1)
|
||||
if _, err := parseListing([]byte(data)); err == nil || !strings.Contains(err.Error(), "map fwd_ports") {
|
||||
t.Errorf("erreur = %v, erreur sur fwd_ports attendue", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestChainRules(t *testing.T) {
|
||||
got := chainRules(listedChain)
|
||||
want := []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"}
|
||||
if strings.Join(got, "|") != strings.Join(want, "|") {
|
||||
t.Errorf("règles %q, %q attendues", got, want)
|
||||
}
|
||||
if got := chainRules("table bridge two {\n\tchain fwd-b {\n\t}\n}\n"); len(got) != 0 {
|
||||
t.Errorf("chaîne vide : %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func healthyListings() map[string][]string {
|
||||
return map[string][]string{
|
||||
"fwd-v-t33a-i": chainRules(listedChain),
|
||||
"out-v-t33a-i": {"arp saddr ip 10.33.0.1 drop", "ip saddr 10.33.0.1 udp sport 67-68 udp dport 67-68 drop"},
|
||||
}
|
||||
}
|
||||
|
||||
func TestMissingIsEmptyWhenEverythingIsInPlace(t *testing.T) {
|
||||
if got := missing(bridgePort(), mustParse(t, listedTable), healthyListings()); len(got) != 0 {
|
||||
t.Errorf("manques %q, aucun attendu", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMissingReportsEachDefect(t *testing.T) {
|
||||
data := strings.Replace(listedTable, `, "elem": [["v-t33a-i", {"jump": {"target": "out-v-t33a-i"}}]]`, "", 1)
|
||||
data = strings.Replace(data, `"data": "@fwd_ports"`, `"data": "@pre_ports"`, 1)
|
||||
listings := healthyListings()
|
||||
listings["fwd-v-t33a-i"] = []string{"arp operation request arp daddr ip 10.33.0.1 drop", "accept"}
|
||||
got := strings.Join(missing(bridgePort(), mustParse(t, data), listings), "\n")
|
||||
for _, want := range []string{
|
||||
"forward: oifname vmap @fwd_ports",
|
||||
`out_ports: "v-t33a-i" : jump out-v-t33a-i`,
|
||||
"fwd-v-t33a-i: ip saddr 10.33.0.1 udp sport 67-68 udp dport 67-68 drop",
|
||||
"fwd-v-t33a-i: unexpected accept",
|
||||
} {
|
||||
if !strings.Contains(got, want) {
|
||||
t.Errorf("%q absent de :\n%s", want, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMissingReportsEverythingWithoutTable(t *testing.T) {
|
||||
got := missing(bridgePort(), mustParse(t, noTable), nil)
|
||||
if len(got) != 8 {
|
||||
t.Errorf("%d manques, 8 attendus (2 aiguillages, 2 éléments, 4 règles) : %q", len(got), got)
|
||||
}
|
||||
}
|
||||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
35
internal/subnet/fabric.go
Normal 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)},
|
||||
}
|
||||
}
|
||||
52
internal/subnet/fabric_test.go
Normal file
52
internal/subnet/fabric_test.go
Normal 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",
|
||||
})
|
||||
}
|
||||
|
|
@ -3,8 +3,9 @@ package watchdog
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"git.g3e.fr/syonad/two/internal/ebtables"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/nft"
|
||||
"git.g3e.fr/syonad/two/internal/subnet"
|
||||
"git.g3e.fr/syonad/two/internal/watchdog/notify"
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
||||
|
|
@ -21,13 +22,13 @@ func checkBridgeGateway(db *badger.DB, name, vpc, nsVeth string, n notify.Notifi
|
|||
return
|
||||
}
|
||||
if err := netns.Call(vpc, func() error {
|
||||
missing, err := ebtables.MissingGatewayRules(nsVeth, gatewayIP)
|
||||
missing, err := nft.MissingRules(subnet.BridgeFabricPort(nsVeth, gatewayIP))
|
||||
if err != nil {
|
||||
n.Notify(kindSubnet, name, fmt.Sprintf("gateway ebtables rules unreadable in netns %s: %v", vpc, err))
|
||||
n.Notify(kindSubnet, name, fmt.Sprintf("gateway nftables rules unreadable in netns %s: %v", vpc, err))
|
||||
return nil
|
||||
}
|
||||
for _, rule := range missing {
|
||||
n.Notify(kindSubnet, name, fmt.Sprintf("ebtables rule missing in netns %s: %s", vpc, rule))
|
||||
n.Notify(kindSubnet, name, fmt.Sprintf("nftables rule missing in netns %s: %s", vpc, rule))
|
||||
}
|
||||
return nil
|
||||
}); err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue