From 9976bc9190b5a0c5cfb111eb11f3a34907e73b92 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 3 Oct 2026 20:41:42 +1000 Subject: [PATCH 1/7] Match any listed port or protocol instead of AND-ing them --- internal/nftables/compiler.go | 356 ++++++++++++++++------------- internal/nftables/compiler_test.go | 94 ++++++++ 2 files changed, 286 insertions(+), 164 deletions(-) diff --git a/internal/nftables/compiler.go b/internal/nftables/compiler.go index 45e6549..2af98ad 100644 --- a/internal/nftables/compiler.go +++ b/internal/nftables/compiler.go @@ -220,34 +220,30 @@ func (c *Compiler) compileConntrack(state *FirewallState) error { chains = []string{"prerouting", "output"} } + matches, err := l4Matches(ct.Proto, ct.DPort, nil) + if err != nil { + return fmt.Errorf("conntrack[%d]: %w", i, err) + } + for _, chain := range chains { - var exprs []expr.Any + for _, m := range matches { + exprs := append([]expr.Any{}, m.exprs...) - if ct.Proto != "" { - exprs = append(exprs, matchProto(ct.Proto)...) - } - for _, p := range ct.DPort { - pe, err := parsePortOrRange(p) - if err != nil { - return fmt.Errorf("conntrack[%d]: %w", i, err) + switch ct.Action { + case config.ConntrackNoTrack: + exprs = append(exprs, &expr.Notrack{}) + case config.ConntrackHelper: + continue + case config.ConntrackDrop: + exprs = append(exprs, &expr.Verdict{Kind: expr.VerdictDrop}) } - exprs = append(exprs, pe...) - } - switch ct.Action { - case config.ConntrackNoTrack: - exprs = append(exprs, &expr.Notrack{}) - case config.ConntrackHelper: - continue - case config.ConntrackDrop: - exprs = append(exprs, &expr.Verdict{Kind: expr.VerdictDrop}) + state.Rules[chain] = append(state.Rules[chain], ManagedRule{ + Chain: chain, + Exprs: exprs, + Tag: tag + ":" + chain, + }) } - - state.Rules[chain] = append(state.Rules[chain], ManagedRule{ - Chain: chain, - Exprs: exprs, - Tag: tag + ":" + chain, - }) } } return nil @@ -362,29 +358,33 @@ func (c *Compiler) compileOneRule(state *FirewallState, tag, srcSpec, dstSpec, p for _, srcIface := range srcIfaces { for _, dstIface := range dstIfaces { - exprs, err := c.buildMatchExprs(srcIface, dstIface, chain, proto, dports, sports, srcAddr, dstAddr) + matches, err := c.buildMatchExprs(srcIface, dstIface, chain, proto, dports, sports, srcAddr, dstAddr) if err != nil { return err } - if section != "" && section != config.SectionAll { - exprs = append(exprs, matchSection(section)...) - } + for _, m := range matches { + exprs := m.exprs - if logLevel != "" { - exprs = append(exprs, buildLog(logLevel, tag)...) - } + if section != "" && section != config.SectionAll { + exprs = append(exprs, matchSection(section)...) + } - verdict := actionVerdict(action, proto, c.cfg.Settings.AddressFamily) - if verdict != nil { - exprs = append(exprs, verdict...) - } + if logLevel != "" { + exprs = append(exprs, buildLog(logLevel, tag)...) + } - state.Rules[chain] = append(state.Rules[chain], ManagedRule{ - Chain: chain, - Exprs: exprs, - Tag: tag, - }) + verdict := actionVerdict(action, m.proto, c.cfg.Settings.AddressFamily) + if verdict != nil { + exprs = append(exprs, verdict...) + } + + state.Rules[chain] = append(state.Rules[chain], ManagedRule{ + Chain: chain, + Exprs: exprs, + Tag: tag, + }) + } } } return nil @@ -413,102 +413,99 @@ func (c *Compiler) compileDNATRule(state *FirewallState, tag, srcSpec, dstSpec, srcIfaces := c.resolveZoneInterfaces(srcZone) + matches, err := l4Matches(proto, dports, nil) + if err != nil { + return err + } + for _, srcIface := range srcIfaces { - var exprs []expr.Any + for _, m := range matches { + var exprs []expr.Any - if srcIface != "" { - exprs = append(exprs, matchIfaceName(true, srcIface)...) - } - - if srcAddr != "" { - src, err := matchSourceCIDR(srcAddr) - if err != nil { - return err + if srcIface != "" { + exprs = append(exprs, matchIfaceName(true, srcIface)...) } - exprs = append(exprs, src...) - } - if proto != "" { - exprs = append(exprs, matchProto(proto)...) - } - - for _, portStr := range dports { - pe, err := parsePortOrRange(portStr) - if err != nil { - return err - } - exprs = append(exprs, pe...) - } - - if logLevel != "" { - exprs = append(exprs, buildLog(logLevel, tag)...) - } - - ip := net.ParseIP(dnatAddr) - if ip == nil { - return fmt.Errorf("invalid DNAT address %q", dnatAddr) - } - - if action == config.RuleRedirect { - if dnatPort > 0 { - portBytes := make([]byte, 2) - binary.BigEndian.PutUint16(portBytes, dnatPort) - exprs = append(exprs, - &expr.Immediate{Register: 1, Data: portBytes}, - &expr.Redir{RegisterProtoMin: 1}, - ) - } else { - exprs = append(exprs, &expr.Redir{}) - } - } else { - if ip4 := ip.To4(); ip4 != nil { - exprs = append(exprs, - &expr.Immediate{Register: 1, Data: ip4}, - ) - natExpr := &expr.NAT{ - Type: expr.NATTypeDestNAT, - Family: unix.NFPROTO_IPV4, - RegAddrMin: 1, - RegAddrMax: 1, + if srcAddr != "" { + src, err := matchSourceCIDR(srcAddr) + if err != nil { + return err } + exprs = append(exprs, src...) + } + + exprs = append(exprs, m.exprs...) + + if logLevel != "" { + exprs = append(exprs, buildLog(logLevel, tag)...) + } + + ip := net.ParseIP(dnatAddr) + if ip == nil { + return fmt.Errorf("invalid DNAT address %q", dnatAddr) + } + + if action == config.RuleRedirect { if dnatPort > 0 { portBytes := make([]byte, 2) binary.BigEndian.PutUint16(portBytes, dnatPort) exprs = append(exprs, - &expr.Immediate{Register: 2, Data: portBytes}, + &expr.Immediate{Register: 1, Data: portBytes}, + &expr.Redir{RegisterProtoMin: 1}, ) - natExpr.RegProtoMin = 2 - natExpr.RegProtoMax = 2 + } else { + exprs = append(exprs, &expr.Redir{}) } - exprs = append(exprs, natExpr) } else { - exprs = append(exprs, - &expr.Immediate{Register: 1, Data: ip.To16()}, - ) - natExpr := &expr.NAT{ - Type: expr.NATTypeDestNAT, - Family: unix.NFPROTO_IPV6, - RegAddrMin: 1, - RegAddrMax: 1, - } - if dnatPort > 0 { - portBytes := make([]byte, 2) - binary.BigEndian.PutUint16(portBytes, dnatPort) + if ip4 := ip.To4(); ip4 != nil { exprs = append(exprs, - &expr.Immediate{Register: 2, Data: portBytes}, + &expr.Immediate{Register: 1, Data: ip4}, ) - natExpr.RegProtoMin = 2 - natExpr.RegProtoMax = 2 + natExpr := &expr.NAT{ + Type: expr.NATTypeDestNAT, + Family: unix.NFPROTO_IPV4, + RegAddrMin: 1, + RegAddrMax: 1, + } + if dnatPort > 0 { + portBytes := make([]byte, 2) + binary.BigEndian.PutUint16(portBytes, dnatPort) + exprs = append(exprs, + &expr.Immediate{Register: 2, Data: portBytes}, + ) + natExpr.RegProtoMin = 2 + natExpr.RegProtoMax = 2 + } + exprs = append(exprs, natExpr) + } else { + exprs = append(exprs, + &expr.Immediate{Register: 1, Data: ip.To16()}, + ) + natExpr := &expr.NAT{ + Type: expr.NATTypeDestNAT, + Family: unix.NFPROTO_IPV6, + RegAddrMin: 1, + RegAddrMax: 1, + } + if dnatPort > 0 { + portBytes := make([]byte, 2) + binary.BigEndian.PutUint16(portBytes, dnatPort) + exprs = append(exprs, + &expr.Immediate{Register: 2, Data: portBytes}, + ) + natExpr.RegProtoMin = 2 + natExpr.RegProtoMax = 2 + } + exprs = append(exprs, natExpr) } - exprs = append(exprs, natExpr) } - } - state.Rules[chain] = append(state.Rules[chain], ManagedRule{ - Chain: chain, - Exprs: exprs, - Tag: tag, - }) + state.Rules[chain] = append(state.Rules[chain], ManagedRule{ + Chain: chain, + Exprs: exprs, + Tag: tag, + }) + } } return nil } @@ -588,25 +585,12 @@ func (c *Compiler) compileSNAT(state *FirewallState) error { exprs = append(exprs, srcExprs...) } - if snat.Proto != "" { - exprs = append(exprs, matchProto(snat.Proto)...) - } - - for _, portStr := range snat.DPort { - pe, err := parsePortOrRange(portStr) - if err != nil { - return fmt.Errorf("snat[%d] dport: %w", i, err) - } - exprs = append(exprs, pe...) - } - - for _, portStr := range snat.SPort { - pe, err := parseSPortOrRange(portStr) - if err != nil { - return fmt.Errorf("snat[%d] sport: %w", i, err) - } - exprs = append(exprs, pe...) + matches, err := l4Matches(snat.Proto, snat.DPort, snat.SPort) + if err != nil { + return fmt.Errorf("snat[%d]: %w", i, err) } + head := exprs + exprs = nil if snat.Mark != "" { exprs = append(exprs, matchMark(snat.Mark)...) @@ -652,11 +636,13 @@ func (c *Compiler) compileSNAT(state *FirewallState) error { } } - state.Rules["postrouting"] = append(state.Rules["postrouting"], ManagedRule{ - Chain: "postrouting", - Exprs: exprs, - Tag: tag, - }) + for _, m := range matches { + state.Rules["postrouting"] = append(state.Rules["postrouting"], ManagedRule{ + Chain: "postrouting", + Exprs: append(append(append([]expr.Any{}, head...), m.exprs...), exprs...), + Tag: tag, + }) + } } return nil @@ -922,7 +908,7 @@ func (c *Compiler) expandZoneRef(ref string) []string { return []string{base} } -func (c *Compiler) buildMatchExprs(srcIface, dstIface, chain, proto string, dports, sports config.PortSpec, srcAddr, dstAddr string) ([]expr.Any, error) { +func (c *Compiler) buildMatchExprs(srcIface, dstIface, chain, proto string, dports, sports config.PortSpec, srcAddr, dstAddr string) ([]l4Match, error) { var exprs []expr.Any if srcIface != "" { @@ -948,34 +934,76 @@ func (c *Compiler) buildMatchExprs(srcIface, dstIface, chain, proto string, dpor exprs = append(exprs, dst...) } + matches, err := l4Matches(proto, dports, sports) + if err != nil { + return nil, err + } + for i := range matches { + matches[i].exprs = append(append([]expr.Any{}, exprs...), matches[i].exprs...) + } + return matches, nil +} + +type l4Match struct { + proto string + exprs []expr.Any +} + +// l4Matches yields one alternative per (proto, dport, sport): nft ANDs a rule's exprs, so lists need one rule each. +func l4Matches(proto string, dports, sports config.PortSpec) ([]l4Match, error) { + protos := []string{""} if proto != "" { - exprs = append(exprs, matchProto(proto)...) + protos = strings.Split(proto, ",") } - isICMP := strings.EqualFold(proto, "icmp") || strings.EqualFold(proto, "icmpv6") || strings.EqualFold(proto, "ipv6-icmp") - - for _, portStr := range dports { + var out []l4Match + for _, p := range protos { + p = strings.TrimSpace(p) + isICMP := strings.EqualFold(p, "icmp") || strings.EqualFold(p, "icmpv6") || strings.EqualFold(p, "ipv6-icmp") + parseD := parsePortOrRange if isICMP { - pe := matchICMPType(portStr) - exprs = append(exprs, pe...) - } else { - pe, err := parsePortOrRange(portStr) - if err != nil { - return nil, err - } - exprs = append(exprs, pe...) + parseD = func(s string) ([]expr.Any, error) { return matchICMPType(s), nil } } - } - - for _, portStr := range sports { - pe, err := parseSPortOrRange(portStr) + dalts, err := portAlternatives(dports, parseD) if err != nil { return nil, err } - exprs = append(exprs, pe...) + salts, err := portAlternatives(sports, parseSPortOrRange) + if err != nil { + return nil, err + } + for _, d := range dalts { + for _, sp := range salts { + var e []expr.Any + if p != "" { + e = append(e, matchProto(p)...) + } + e = append(append(e, d...), sp...) + out = append(out, l4Match{proto: p, exprs: e}) + } + } } + return out, nil +} - return exprs, nil +func portAlternatives(ports config.PortSpec, parse func(string) ([]expr.Any, error)) ([][]expr.Any, error) { + var alts [][]expr.Any + for _, item := range ports { + for _, s := range strings.Split(item, ",") { + if s = strings.TrimSpace(s); s == "" { + continue + } + e, err := parse(s) + if err != nil { + return nil, err + } + alts = append(alts, e) + } + } + if len(alts) == 0 { + return [][]expr.Any{nil}, nil + } + return alts, nil } // matchIfaceName matches an interface name, supporting wildcard "+" suffix. @@ -1218,8 +1246,8 @@ func matchConnLimit(spec string) []expr.Any { } func parsePortOrRange(s string) ([]expr.Any, error) { - if strings.Contains(s, "-") { - parts := strings.SplitN(s, "-", 2) + if i := strings.IndexAny(s, "-:"); i >= 0 { + parts := []string{s[:i], s[i+1:]} low, err := strconv.ParseUint(parts[0], 10, 16) if err != nil { return nil, fmt.Errorf("invalid port range low %q: %w", parts[0], err) @@ -1238,8 +1266,8 @@ func parsePortOrRange(s string) ([]expr.Any, error) { } func parseSPortOrRange(s string) ([]expr.Any, error) { - if strings.Contains(s, "-") { - parts := strings.SplitN(s, "-", 2) + if i := strings.IndexAny(s, "-:"); i >= 0 { + parts := []string{s[:i], s[i+1:]} low, err := strconv.ParseUint(parts[0], 10, 16) if err != nil { return nil, fmt.Errorf("invalid sport range low %q: %w", parts[0], err) diff --git a/internal/nftables/compiler_test.go b/internal/nftables/compiler_test.go index 84fa751..bcc1db7 100644 --- a/internal/nftables/compiler_test.go +++ b/internal/nftables/compiler_test.go @@ -1,6 +1,10 @@ package nftables import ( + "encoding/binary" + "fmt" + "reflect" + "strings" "testing" "github.com/google/nftables/expr" @@ -1531,3 +1535,93 @@ func TestCompile_PolicyRateLimit(t *testing.T) { } t.Error("policy:0 not found in input chain") } + +func TestCompile_PortAndProtoLists(t *testing.T) { + type want struct { + proto byte + dport string // "80" for an exact compare, "8000-8100" for a range + } + tests := []struct { + name string + rule config.Rule + chain string + want []want + }{ + { + name: "multi-port", + rule: config.Rule{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "tcp", DPort: config.PortSpec{"80", "443"}}, + chain: "input", + want: []want{{6, "80"}, {6, "443"}}, + }, + { + name: "range in list", + rule: config.Rule{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "tcp", DPort: config.PortSpec{"22", "8000:8100"}}, + chain: "input", + want: []want{{6, "22"}, {6, "8000-8100"}}, + }, + { + name: "comma string", + rule: config.Rule{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "tcp", DPort: config.PortSpec{"80,443"}}, + chain: "input", + want: []want{{6, "80"}, {6, "443"}}, + }, + { + name: "tcp,udp", + rule: config.Rule{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "tcp,udp", DPort: config.PortSpec{"53"}}, + chain: "input", + want: []want{{6, "53"}, {17, "53"}}, + }, + { + name: "dnat tcp,udp", + rule: config.Rule{Action: config.RuleDNAT, Source: "net", Dest: "fw:192.0.2.10", Proto: "tcp,udp", DPort: config.PortSpec{"53"}}, + chain: "prerouting", + want: []want{{6, "53"}, {17, "53"}}, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + cfg := &config.Config{ + Settings: config.Settings{TableName: "test", AddressFamily: config.FamilyINET}, + Zones: map[string]config.Zone{"fw": {Type: config.ZoneFirewall}, "net": {Type: config.ZoneIP}}, + Interfaces: []config.Interface{{Zone: "net", Interface: "eth0"}}, + Policy: []config.Policy{{Source: "all", Dest: "all", Action: config.PolicyDrop}}, + Rules: []config.Rule{tt.rule}, + PortGroups: make(map[string]config.PortGroup), + } + state, err := NewCompiler(cfg).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + + var got []want + for _, r := range state.Rules[tt.chain] { + if r.Tag != "rule:0" { + continue + } + var w want + var portCmps []string + for i, e := range r.Exprs { + if m, ok := e.(*expr.Meta); ok && m.Key == expr.MetaKeyL4PROTO { + w.proto = r.Exprs[i+1].(*expr.Cmp).Data[0] + } + if p, ok := e.(*expr.Payload); ok && p.Base == expr.PayloadBaseTransportHeader && p.Offset == 2 { + for _, c := range r.Exprs[i+1:] { + cmp, ok := c.(*expr.Cmp) + if !ok { + break + } + portCmps = append(portCmps, fmt.Sprint(binary.BigEndian.Uint16(cmp.Data))) + } + } + } + w.dport = strings.Join(portCmps, "-") + got = append(got, w) + } + + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("rules = %+v, want %+v", got, tt.want) + } + }) + } +} From 30758855ffaf964035682099a89e8c28f3eae52b Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 3 Oct 2026 20:45:16 +1000 Subject: [PATCH 2/7] Reject empty list elements, unknown ICMP types and limits on list rules --- internal/nftables/compiler.go | 29 +++++-- internal/nftables/compiler_test.go | 126 ++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 9 deletions(-) diff --git a/internal/nftables/compiler.go b/internal/nftables/compiler.go index 2af98ad..161f944 100644 --- a/internal/nftables/compiler.go +++ b/internal/nftables/compiler.go @@ -267,6 +267,16 @@ func (c *Compiler) compileRules(state *FirewallState) error { sport = rule.SPort } + if rule.RateLimit != "" || rule.ConnLimit != "" { + matches, err := l4Matches(proto, dports, sport) + if err != nil { + return fmt.Errorf("rule[%d]: %w", i, err) + } + if len(matches) > 1 { + return fmt.Errorf("rule[%d]: ratelimit/connlimit cannot be combined with proto or port lists (each expanded rule would get its own limiter)", i) + } + } + if err := c.compileOneRule(state, tag, rule.Source, rule.Dest, proto, dports, sport, rule.Action, rule.Log, rule.Dest, fwZone, rule.Section); err != nil { @@ -959,10 +969,13 @@ func l4Matches(proto string, dports, sports config.PortSpec) ([]l4Match, error) var out []l4Match for _, p := range protos { p = strings.TrimSpace(p) + if proto != "" && p == "" { + return nil, fmt.Errorf("empty element in proto list %q", proto) + } isICMP := strings.EqualFold(p, "icmp") || strings.EqualFold(p, "icmpv6") || strings.EqualFold(p, "ipv6-icmp") parseD := parsePortOrRange if isICMP { - parseD = func(s string) ([]expr.Any, error) { return matchICMPType(s), nil } + parseD = matchICMPType } dalts, err := portAlternatives(dports, parseD) if err != nil { @@ -991,7 +1004,7 @@ func portAlternatives(ports config.PortSpec, parse func(string) ([]expr.Any, err for _, item := range ports { for _, s := range strings.Split(item, ",") { if s = strings.TrimSpace(s); s == "" { - continue + return nil, fmt.Errorf("empty element in port list %q", item) } e, err := parse(s) if err != nil { @@ -1169,33 +1182,33 @@ var icmpTypeNames = map[string]byte{ "address-mask-reply": 18, } -func matchICMPType(spec string) []expr.Any { +func matchICMPType(spec string) ([]expr.Any, error) { if strings.Contains(spec, "/") { parts := strings.SplitN(spec, "/", 2) typeVal, ok := resolveICMPType(parts[0]) if !ok { - return nil + return nil, fmt.Errorf("invalid icmp type %q", parts[0]) } code, err := strconv.ParseUint(parts[1], 10, 8) if err != nil { - return nil + return nil, fmt.Errorf("invalid icmp code %q: %w", parts[1], err) } return []expr.Any{ &expr.Payload{DestRegister: 1, Base: expr.PayloadBaseTransportHeader, Offset: 0, Len: 1}, &expr.Cmp{Op: expr.CmpOpEq, Register: 1, Data: []byte{typeVal}}, &expr.Payload{DestRegister: 1, Base: expr.PayloadBaseTransportHeader, Offset: 1, Len: 1}, &expr.Cmp{Op: expr.CmpOpEq, Register: 1, Data: []byte{byte(code)}}, - } + }, nil } typeVal, ok := resolveICMPType(spec) if !ok { - return nil + return nil, fmt.Errorf("invalid icmp type %q", spec) } return []expr.Any{ &expr.Payload{DestRegister: 1, Base: expr.PayloadBaseTransportHeader, Offset: 0, Len: 1}, &expr.Cmp{Op: expr.CmpOpEq, Register: 1, Data: []byte{typeVal}}, - } + }, nil } func resolveICMPType(s string) (byte, bool) { diff --git a/internal/nftables/compiler_test.go b/internal/nftables/compiler_test.go index bcc1db7..50b1263 100644 --- a/internal/nftables/compiler_test.go +++ b/internal/nftables/compiler_test.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/google/nftables/expr" + "golang.org/x/sys/unix" "git.unkin.net/unkin/tomswall/internal/config" ) @@ -1269,7 +1270,10 @@ func TestMatchICMPType(t *testing.T) { } for _, tt := range tests { - exprs := matchICMPType(tt.input) + exprs, err := matchICMPType(tt.input) + if err != nil { + t.Fatalf("matchICMPType(%q) error: %v", tt.input, err) + } if len(exprs) != tt.wantLen { t.Errorf("matchICMPType(%q) returned %d exprs, want %d", tt.input, len(exprs), tt.wantLen) } @@ -1625,3 +1629,123 @@ func TestCompile_PortAndProtoLists(t *testing.T) { }) } } + +func listCfg(mod func(*config.Config)) *config.Config { + cfg := &config.Config{ + Settings: config.Settings{TableName: "test", AddressFamily: config.FamilyINET}, + Zones: map[string]config.Zone{"fw": {Type: config.ZoneFirewall}, "net": {Type: config.ZoneIP}}, + Interfaces: []config.Interface{{Zone: "net", Interface: "eth0"}}, + Policy: []config.Policy{{Source: "all", Dest: "all", Action: config.PolicyDrop}}, + PortGroups: make(map[string]config.PortGroup), + } + mod(cfg) + return cfg +} + +func taggedRules(state *FirewallState, chain, tag string) []ManagedRule { + var out []ManagedRule + for _, r := range state.Rules[chain] { + if r.Tag == tag { + out = append(out, r) + } + } + return out +} + +func TestCompile_ListExpansionCounts(t *testing.T) { + tests := []struct { + name string + mod func(*config.Config) + chain string + tag string + want int + }{ + {"proto x dport cross product", func(c *config.Config) { + c.Rules = []config.Rule{{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "tcp,udp", DPort: config.PortSpec{"80", "443"}}} + }, "input", "rule:0", 4}, + {"sport list", func(c *config.Config) { + c.Rules = []config.Rule{{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "tcp", SPort: config.PortSpec{"1024,2048"}}} + }, "input", "rule:0", 2}, + {"snat proto x dport", func(c *config.Config) { + c.SNAT = []config.SNATRule{{Action: config.SNATMasquerade, Dest: "eth0", Proto: "tcp,udp", DPort: config.PortSpec{"80,443"}}} + }, "postrouting", "snat:0", 4}, + {"conntrack dport list", func(c *config.Config) { + c.Conntrack = []config.ConntrackRule{{Action: config.ConntrackNoTrack, Proto: "udp", DPort: config.PortSpec{"53", "123"}}} + }, "prerouting", "conntrack:0:prerouting", 2}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + state, err := NewCompiler(listCfg(tt.mod)).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + if got := len(taggedRules(state, tt.chain, tt.tag)); got != tt.want { + t.Errorf("%s rules in %s = %d, want %d", tt.tag, tt.chain, got, tt.want) + } + }) + } +} + +func TestCompile_RejectPerProto(t *testing.T) { + state, err := NewCompiler(listCfg(func(c *config.Config) { + c.Rules = []config.Rule{{Action: config.RuleReject, Source: "net", Dest: "fw", Proto: "tcp,udp", DPort: config.PortSpec{"53"}}} + })).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + rules := taggedRules(state, "input", "rule:0") + if len(rules) != 2 { + t.Fatalf("got %d rules, want 2", len(rules)) + } + want := []uint32{unix.NFT_REJECT_TCP_RST, unix.NFT_REJECT_ICMPX_UNREACH} + for i, r := range rules { + rej, ok := r.Exprs[len(r.Exprs)-1].(*expr.Reject) + if !ok { + t.Fatalf("rule %d: last expr %T, want *expr.Reject", i, r.Exprs[len(r.Exprs)-1]) + } + if rej.Type != want[i] { + t.Errorf("rule %d: reject type %d, want %d", i, rej.Type, want[i]) + } + } +} + +func TestCompile_ListErrors(t *testing.T) { + tests := []struct { + name string + rule config.Rule + }{ + {"invalid port in list", config.Rule{Proto: "tcp", DPort: config.PortSpec{"80,abc"}}}, + {"trailing empty proto", config.Rule{Proto: "tcp,", DPort: config.PortSpec{"80"}}}, + {"leading empty proto", config.Rule{Proto: ",udp", DPort: config.PortSpec{"80"}}}, + {"empty port element", config.Rule{Proto: "tcp", DPort: config.PortSpec{"80,"}}}, + {"unknown icmp type", config.Rule{Proto: "icmp", DPort: config.PortSpec{"bogus"}}}, + {"ratelimit with port list", config.Rule{Proto: "tcp", DPort: config.PortSpec{"80,443"}, RateLimit: "10/sec"}}, + {"connlimit with proto list", config.Rule{Proto: "tcp,udp", DPort: config.PortSpec{"53"}, ConnLimit: "10"}}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + r := tt.rule + r.Action, r.Source, r.Dest = config.RuleAccept, "net", "fw" + _, err := NewCompiler(listCfg(func(c *config.Config) { c.Rules = []config.Rule{r} })).Compile() + if err == nil { + t.Fatal("Compile() succeeded, want error") + } + }) + } +} + +func TestCompile_ListExpansionDiffStable(t *testing.T) { + cfg := listCfg(func(c *config.Config) { + c.Rules = []config.Rule{{Action: config.RuleReject, Source: "net", Dest: "fw", Proto: "tcp,udp", DPort: config.PortSpec{"80,443"}}} + }) + state, err := NewCompiler(cfg).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + if n := len(taggedRules(state, "input", "rule:0")); n != 4 { + t.Fatalf("got %d rule:0 rules, want 4", n) + } + if cs := computeDiff(state, state); !cs.Empty() { + t.Errorf("diff not empty:\n%s", cs.Summary()) + } +} From 211bacd5078fac1d090c6163c395edb1b5ff431a Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 3 Oct 2026 20:45:32 +1000 Subject: [PATCH 3/7] Expand comma zone lists in rule source and dest --- internal/config/blrules.go | 14 +-- internal/config/config_test.go | 33 +++++++ internal/config/rules.go | 38 +++++-- internal/nftables/compiler.go | 90 ++++++++++++++--- internal/nftables/compiler_test.go | 153 +++++++++++++++++++++++++++++ 5 files changed, 297 insertions(+), 31 deletions(-) diff --git a/internal/config/blrules.go b/internal/config/blrules.go index b1fc8e3..f361ea1 100644 --- a/internal/config/blrules.go +++ b/internal/config/blrules.go @@ -57,17 +57,19 @@ func (c *Config) validateBlrules() error { if r.Source != "all" && r.Source != "any" && r.Source != "none" && !hasPrefix(r.Source, "all!") && !hasPrefix(r.Source, "any!") { - srcZone := zoneFromSpec(r.Source) - if _, ok := c.Zones[srcZone]; !ok { - return fmt.Errorf("blrules[%d]: source zone %q not defined", i, srcZone) + for _, zs := range SplitZoneList(r.Source) { + if _, ok := c.Zones[zs.Zone]; !ok { + return fmt.Errorf("blrules[%d]: source zone %q not defined", i, zs.Zone) + } } } if r.Dest != "all" && r.Dest != "any" && r.Dest != "none" && !hasPrefix(r.Dest, "all!") && !hasPrefix(r.Dest, "any!") { - dstZone := zoneFromSpec(r.Dest) - if _, ok := c.Zones[dstZone]; !ok { - return fmt.Errorf("blrules[%d]: dest zone %q not defined", i, dstZone) + for _, zs := range SplitZoneList(r.Dest) { + if _, ok := c.Zones[zs.Zone]; !ok { + return fmt.Errorf("blrules[%d]: dest zone %q not defined", i, zs.Zone) + } } } } diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 4041c1b..012c997 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -3,6 +3,7 @@ package config import ( "os" "path/filepath" + "reflect" "strings" "testing" ) @@ -854,6 +855,19 @@ func TestValidateRules(t *testing.T) { }, wantErr: "source zone \"missing\" not defined", }, + { + name: "comma zone lists are valid", + rules: []Rule{ + {Action: RuleAccept, Source: "fw,loc", Dest: "loc,net:192.0.2.1,198.51.100.1"}, + }, + }, + { + name: "undefined zone in dest list", + rules: []Rule{ + {Action: RuleAccept, Source: "loc", Dest: "net,missing"}, + }, + wantErr: "dest zone \"missing\" not defined", + }, { name: "all keyword is valid source", rules: []Rule{ @@ -1006,3 +1020,22 @@ func TestValidateSNAT(t *testing.T) { }) } } + +func TestSplitZoneList(t *testing.T) { + tests := []struct { + in string + want []ZoneSpec + }{ + {"net", []ZoneSpec{{Zone: "net"}}}, + {"fw,lan,svr", []ZoneSpec{{Zone: "fw"}, {Zone: "lan"}, {Zone: "svr"}}}, + {"svr:192.0.2.17", []ZoneSpec{{Zone: "svr", Addr: "192.0.2.17"}}}, + {"net:192.0.2.1,198.51.100.1", []ZoneSpec{{Zone: "net", Addr: "192.0.2.1,198.51.100.1"}}}, + {"lan,svr:192.0.2.17", []ZoneSpec{{Zone: "lan"}, {Zone: "svr", Addr: "192.0.2.17"}}}, + {"net:2001:db8::1", []ZoneSpec{{Zone: "net", Addr: "2001:db8::1"}}}, + } + for _, tt := range tests { + if got := SplitZoneList(tt.in); !reflect.DeepEqual(got, tt.want) { + t.Errorf("SplitZoneList(%q) = %+v, want %+v", tt.in, got, tt.want) + } + } +} diff --git a/internal/config/rules.go b/internal/config/rules.go index 0a52040..1b36111 100644 --- a/internal/config/rules.go +++ b/internal/config/rules.go @@ -1,6 +1,9 @@ package config -import "fmt" +import ( + "fmt" + "strings" +) type RuleAction string @@ -172,10 +175,9 @@ func (c *Config) validateRules() error { if r.Source != "all" && r.Source != "any" && r.Source != "none" && !hasPrefix(r.Source, "all+") && !hasPrefix(r.Source, "all!") && !hasPrefix(r.Source, "any!") { - for _, srcPart := range splitZones(r.Source) { - srcZone := zoneFromSpec(srcPart) - if _, ok := c.Zones[srcZone]; !ok { - return fmt.Errorf("rule[%d]: source zone %q not defined", i, srcZone) + for _, zs := range SplitZoneList(r.Source) { + if _, ok := c.Zones[zs.Zone]; !ok { + return fmt.Errorf("rule[%d]: source zone %q not defined", i, zs.Zone) } } } @@ -183,10 +185,9 @@ func (c *Config) validateRules() error { if r.Action != RuleDNAT && r.Action != RuleRedirect && r.Action != RuleNoNAT { if r.Dest != "all" && r.Dest != "any" && r.Dest != "none" && !hasPrefix(r.Dest, "all+") && !hasPrefix(r.Dest, "all!") && !hasPrefix(r.Dest, "any!") { - for _, dstPart := range splitZones(r.Dest) { - dstZone := zoneFromSpec(dstPart) - if _, ok := c.Zones[dstZone]; !ok { - return fmt.Errorf("rule[%d]: dest zone %q not defined", i, dstZone) + for _, zs := range SplitZoneList(r.Dest) { + if _, ok := c.Zones[zs.Zone]; !ok { + return fmt.Errorf("rule[%d]: dest zone %q not defined", i, zs.Zone) } } } @@ -223,6 +224,25 @@ func (c *Config) validateRules() error { return nil } +// ZoneSpec is one zone of a SOURCE/DEST list; Addr is its comma-separated address list, if any. +type ZoneSpec struct{ Zone, Addr string } + +// SplitZoneList parses "lan,svr:a,b": commas before the first colon separate zones, +// commas after it separate addresses of the last zone (shorewall semantics). +func SplitZoneList(spec string) []ZoneSpec { + zones, addr, _ := strings.Cut(spec, ":") + var out []ZoneSpec + for _, z := range strings.Split(zones, ",") { + if z = strings.TrimSpace(z); z != "" { + out = append(out, ZoneSpec{Zone: z}) + } + } + if len(out) > 0 { + out[len(out)-1].Addr = addr + } + return out +} + // zoneFromSpec extracts the zone name from a zone spec like "net" or "net:192.168.1.0/24". func zoneFromSpec(spec string) string { for i, c := range spec { diff --git a/internal/nftables/compiler.go b/internal/nftables/compiler.go index 2af98ad..e5a9737 100644 --- a/internal/nftables/compiler.go +++ b/internal/nftables/compiler.go @@ -3,6 +3,7 @@ package nftables import ( "encoding/binary" "fmt" + "log/slog" "net" "strconv" "strings" @@ -285,11 +286,12 @@ func (c *Compiler) compileRules(state *FirewallState) error { } func (c *Compiler) applyRuleExtras(state *FirewallState, tag string, rule config.Rule) { - fwZone := c.cfg.FirewallZone() - srcZone, _ := splitZoneSpec(rule.Source) - dstZone, _ := splitZoneSpec(rule.Dest) - chain := c.selectChain(srcZone, dstZone, fwZone) + for chain := range state.Rules { + c.applyChainExtras(state, chain, tag, rule) + } +} +func (c *Compiler) applyChainExtras(state *FirewallState, chain, tag string, rule config.Rule) { rules := state.Rules[chain] for idx := len(rules) - 1; idx >= 0; idx-- { if rules[idx].Tag != tag { @@ -345,13 +347,47 @@ func (c *Compiler) compileOneRule(state *FirewallState, tag, srcSpec, dstSpec, p dports, sports config.PortSpec, action config.RuleAction, logLevel string, dnatDest string, fwZone string, section config.RuleSection) error { - srcZone, srcAddr := splitZoneSpec(srcSpec) - dstZone, dstAddr := splitZoneSpec(dstSpec) - - if action == config.RuleDNAT || action == config.RuleRedirect { - return c.compileDNATRule(state, tag, srcSpec, dstSpec, proto, dports, sports, action, logLevel, fwZone) + for _, src := range zoneSpecs(srcSpec) { + for _, srcAddr := range splitAddrs(src.Addr) { + if action == config.RuleDNAT || action == config.RuleRedirect { + if err := c.compileDNATRule(state, tag, src.Zone, srcAddr, dstSpec, proto, dports, action, logLevel); err != nil { + return err + } + continue + } + for _, dst := range zoneSpecs(dstSpec) { + for _, dstAddr := range splitAddrs(dst.Addr) { + if err := c.compileZonePair(state, tag, src.Zone, srcAddr, dst.Zone, dstAddr, proto, + dports, sports, action, logLevel, fwZone, section); err != nil { + return err + } + } + } + } } + return nil +} +// zoneSpecs expands a comma zone list; "all"/"any" forms keep their own comma (exclusion) syntax. +func zoneSpecs(spec string) []config.ZoneSpec { + if strings.HasPrefix(spec, "all") || strings.HasPrefix(spec, "any") { + zone, addr := splitZoneSpec(spec) + return []config.ZoneSpec{{Zone: zone, Addr: addr}} + } + return config.SplitZoneList(spec) +} + +// splitAddrs yields one alternative per listed address; a negated list stays one AND-ed match. +func splitAddrs(addr string) []string { + if addr == "" || strings.HasPrefix(addr, "!") { + return []string{addr} + } + return strings.Split(addr, ",") +} + +func (c *Compiler) compileZonePair(state *FirewallState, tag, srcZone, srcAddr, dstZone, dstAddr, proto string, + dports, sports config.PortSpec, action config.RuleAction, logLevel string, + fwZone string, section config.RuleSection) error { srcIfaces := c.resolveZoneInterfaces(srcZone) dstIfaces := c.resolveZoneInterfaces(dstZone) chain := c.selectChain(srcZone, dstZone, fwZone) @@ -390,10 +426,8 @@ func (c *Compiler) compileOneRule(state *FirewallState, tag, srcSpec, dstSpec, p return nil } -func (c *Compiler) compileDNATRule(state *FirewallState, tag, srcSpec, dstSpec, proto string, - dports, sports config.PortSpec, action config.RuleAction, logLevel, fwZone string) error { - - srcZone, srcAddr := splitZoneSpec(srcSpec) +func (c *Compiler) compileDNATRule(state *FirewallState, tag, srcZone, srcAddr, dstSpec, proto string, + dports config.PortSpec, action config.RuleAction, logLevel string) error { chain := "prerouting" parts := strings.SplitN(dstSpec, ":", 3) @@ -874,10 +908,23 @@ func (c *Compiler) resolveZoneInterfaces(zone string) []string { return []string{""} } ifaces := c.cfg.ZoneInterfaces(zone) - if len(ifaces) == 0 { - return []string{""} + if len(ifaces) > 0 { + return ifaces } - return ifaces + if z, ok := c.cfg.Zones[zone]; ok && z.Type != config.ZoneFirewall && !c.zoneHasHosts(zone) { + slog.Warn("compiler: zone has no interfaces, skipping its rules", "zone", zone) + return nil + } + return []string{""} +} + +func (c *Compiler) zoneHasHosts(zone string) bool { + for _, h := range c.cfg.Hosts { + if h.Zone == zone { + return true + } + } + return false } func (c *Compiler) expandZoneRef(ref string) []string { @@ -1298,6 +1345,17 @@ func matchAddrCIDR(cidr string, isSrc bool) ([]expr.Any, error) { if strings.HasPrefix(cidr, "!") { negated = true cidr = cidr[1:] + if strings.Contains(cidr, ",") { + var all []expr.Any + for _, a := range strings.Split(cidr, ",") { + e, err := matchAddrCIDR("!"+a, isSrc) + if err != nil { + return nil, err + } + all = append(all, e...) + } + return all, nil + } } cmpOp := expr.CmpOpEq diff --git a/internal/nftables/compiler_test.go b/internal/nftables/compiler_test.go index bcc1db7..6ae3a27 100644 --- a/internal/nftables/compiler_test.go +++ b/internal/nftables/compiler_test.go @@ -1625,3 +1625,156 @@ func TestCompile_PortAndProtoLists(t *testing.T) { }) } } + +// describeRule renders a rule's iif/oif/saddr/daddr matches, e.g. "iif=eth1 oif=eth2 daddr=192.0.2.1". +func describeRule(r ManagedRule) string { + var parts []string + for i, e := range r.Exprs { + cmp, ok := func() (*expr.Cmp, bool) { + if i+1 >= len(r.Exprs) { + return nil, false + } + c, ok := r.Exprs[i+1].(*expr.Cmp) + return c, ok + }() + if !ok { + continue + } + switch m := e.(type) { + case *expr.Meta: + switch m.Key { + case expr.MetaKeyIIFNAME: + parts = append(parts, "iif="+strings.TrimRight(string(cmp.Data), "\x00")) + case expr.MetaKeyOIFNAME: + parts = append(parts, "oif="+strings.TrimRight(string(cmp.Data), "\x00")) + } + case *expr.Payload: + if m.Base == expr.PayloadBaseNetworkHeader && m.Len == 4 { + name := map[uint32]string{12: "saddr", 16: "daddr"}[m.Offset] + parts = append(parts, fmt.Sprintf("%s=%d.%d.%d.%d", name, cmp.Data[0], cmp.Data[1], cmp.Data[2], cmp.Data[3])) + } + } + } + return strings.Join(parts, " ") +} + +func TestCompile_CommaZoneLists(t *testing.T) { + tests := []struct { + name string + rule config.Rule + want map[string][]string + }{ + { + name: "fw in source list goes to output", + rule: config.Rule{Action: config.RuleAccept, Source: "fw,lan", Dest: "svr", Proto: "tcp", DPort: config.PortSpec{"22"}}, + want: map[string][]string{"output": {""}, "forward": {"iif=eth1 oif=eth2"}}, + }, + { + name: "dest list with fw splits input and forward", + rule: config.Rule{Action: config.RuleAccept, Source: "lan", Dest: "fw,svr,net"}, + want: map[string][]string{"input": {"iif=eth1"}, "forward": {"iif=eth1 oif=eth2", "iif=eth1 oif=eth0"}}, + }, + { + name: "zone without interfaces emits nothing", + rule: config.Rule{Action: config.RuleAccept, Source: "lan", Dest: "svr,dmz"}, + want: map[string][]string{"forward": {"iif=eth1 oif=eth2"}}, + }, + { + name: "address list after colon belongs to one zone", + rule: config.Rule{Action: config.RuleAccept, Source: "lan", Dest: "net:192.0.2.1,198.51.100.1"}, + want: map[string][]string{"forward": {"iif=eth1 oif=eth0 daddr=192.0.2.1", "iif=eth1 oif=eth0 daddr=198.51.100.1"}}, + }, + { + name: "zone:address inside a list", + rule: config.Rule{Action: config.RuleAccept, Source: "lan,svr:203.0.113.7", Dest: "fw"}, + want: map[string][]string{"input": {"iif=eth1", "iif=eth2 saddr=203.0.113.7"}}, + }, + { + name: "dnat source list", + rule: config.Rule{Action: config.RuleDNAT, Source: "net,lan", Dest: "svr:192.0.2.10", Proto: "tcp", DPort: config.PortSpec{"80"}}, + want: map[string][]string{"prerouting": {"iif=eth0", "iif=eth1"}}, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + cfg := &config.Config{ + Settings: config.Settings{TableName: "test", AddressFamily: config.FamilyINET}, + Zones: map[string]config.Zone{ + "fw": {Type: config.ZoneFirewall}, "net": {Type: config.ZoneIP}, + "lan": {Type: config.ZoneIP}, "svr": {Type: config.ZoneIP}, "dmz": {Type: config.ZoneIP}, + }, + Interfaces: []config.Interface{ + {Zone: "net", Interface: "eth0"}, {Zone: "lan", Interface: "eth1"}, {Zone: "svr", Interface: "eth2"}, + }, + Rules: []config.Rule{tt.rule}, + PortGroups: make(map[string]config.PortGroup), + } + state, err := NewCompiler(cfg).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + got := map[string][]string{} + for chain, rules := range state.Rules { + for _, r := range rules { + if r.Tag == "rule:0" { + got[chain] = append(got[chain], describeRule(r)) + } + } + } + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("rules = %v, want %v", got, tt.want) + } + }) + } +} + +func TestCompile_CommaZoneListExtras(t *testing.T) { + cfg := &config.Config{ + Settings: config.Settings{TableName: "test", AddressFamily: config.FamilyINET}, + Zones: map[string]config.Zone{"fw": {Type: config.ZoneFirewall}, "net": {Type: config.ZoneIP}, "lan": {Type: config.ZoneIP}}, + Interfaces: []config.Interface{{Zone: "net", Interface: "eth0"}, {Zone: "lan", Interface: "eth1"}}, + Rules: []config.Rule{{Action: config.RuleAccept, Source: "net", Dest: "fw,lan", RateLimit: "10/sec:5"}}, + PortGroups: make(map[string]config.PortGroup), + } + state, err := NewCompiler(cfg).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + for _, chain := range []string{"input", "forward"} { + found := false + for _, r := range state.Rules[chain] { + if r.Tag != "rule:0" { + continue + } + found = true + hasLimit := false + for _, e := range r.Exprs { + if _, ok := e.(*expr.Limit); ok { + hasLimit = true + } + } + if !hasLimit { + t.Errorf("%s rule missing Limit expression", chain) + } + } + if !found { + t.Errorf("rule:0 not found in %s chain", chain) + } + } +} + +func TestNegatedAddressList(t *testing.T) { + exprs, err := matchDestCIDR("!192.0.2.1,198.51.100.1") + if err != nil { + t.Fatalf("matchDestCIDR error: %v", err) + } + if len(exprs) != 4 { + t.Fatalf("expected 4 exprs, got %d", len(exprs)) + } + for _, i := range []int{1, 3} { + if exprs[i].(*expr.Cmp).Op != expr.CmpOpNeq { + t.Errorf("expr %d should be CmpOpNeq", i) + } + } +} From 9c30f1fa544ec1edf713e79c21992e7ccabf9571 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 3 Oct 2026 20:47:46 +1000 Subject: [PATCH 4/7] Reject unknown protocols and dports on mixed ICMP proto lists --- internal/nftables/compiler.go | 36 +++++++++----- internal/nftables/compiler_test.go | 78 ++++++++++++++++++++++++++---- 2 files changed, 92 insertions(+), 22 deletions(-) diff --git a/internal/nftables/compiler.go b/internal/nftables/compiler.go index 161f944..2fc1e4d 100644 --- a/internal/nftables/compiler.go +++ b/internal/nftables/compiler.go @@ -428,6 +428,11 @@ func (c *Compiler) compileDNATRule(state *FirewallState, tag, srcSpec, dstSpec, return err } + ip := net.ParseIP(dnatAddr) + if ip == nil { + return fmt.Errorf("invalid DNAT address %q", dnatAddr) + } + for _, srcIface := range srcIfaces { for _, m := range matches { var exprs []expr.Any @@ -450,11 +455,6 @@ func (c *Compiler) compileDNATRule(state *FirewallState, tag, srcSpec, dstSpec, exprs = append(exprs, buildLog(logLevel, tag)...) } - ip := net.ParseIP(dnatAddr) - if ip == nil { - return fmt.Errorf("invalid DNAT address %q", dnatAddr) - } - if action == config.RuleRedirect { if dnatPort > 0 { portBytes := make([]byte, 2) @@ -975,8 +975,19 @@ func l4Matches(proto string, dports, sports config.PortSpec) ([]l4Match, error) isICMP := strings.EqualFold(p, "icmp") || strings.EqualFold(p, "icmpv6") || strings.EqualFold(p, "ipv6-icmp") parseD := parsePortOrRange if isICMP { + if len(protos) > 1 && len(dports) > 0 { + return nil, fmt.Errorf("dport %v is ambiguous with %s in proto list %q", dports, p, proto) + } parseD = matchICMPType } + var pm []expr.Any + if p != "" { + m, err := matchProto(p) + if err != nil { + return nil, err + } + pm = m + } dalts, err := portAlternatives(dports, parseD) if err != nil { return nil, err @@ -987,11 +998,7 @@ func l4Matches(proto string, dports, sports config.PortSpec) ([]l4Match, error) } for _, d := range dalts { for _, sp := range salts { - var e []expr.Any - if p != "" { - e = append(e, matchProto(p)...) - } - e = append(append(e, d...), sp...) + e := append(append(append([]expr.Any{}, pm...), d...), sp...) out = append(out, l4Match{proto: p, exprs: e}) } } @@ -1044,7 +1051,7 @@ func matchIfaceName(input bool, name string) []expr.Any { } } -func matchProto(proto string) []expr.Any { +func matchProto(proto string) ([]expr.Any, error) { var protoNum byte switch strings.ToLower(proto) { case "tcp": @@ -1064,13 +1071,16 @@ func matchProto(proto string) []expr.Any { case "sctp": protoNum = unix.IPPROTO_SCTP default: - n, _ := strconv.Atoi(proto) + n, err := strconv.ParseUint(proto, 10, 8) + if err != nil { + return nil, fmt.Errorf("unknown protocol %q", proto) + } protoNum = byte(n) } return []expr.Any{ &expr.Meta{Key: expr.MetaKeyL4PROTO, Register: 1}, &expr.Cmp{Op: expr.CmpOpEq, Register: 1, Data: []byte{protoNum}}, - } + }, nil } func matchDPort(port uint16) []expr.Any { diff --git a/internal/nftables/compiler_test.go b/internal/nftables/compiler_test.go index 50b1263..939c4a9 100644 --- a/internal/nftables/compiler_test.go +++ b/internal/nftables/compiler_test.go @@ -1719,6 +1719,12 @@ func TestCompile_ListErrors(t *testing.T) { {"leading empty proto", config.Rule{Proto: ",udp", DPort: config.PortSpec{"80"}}}, {"empty port element", config.Rule{Proto: "tcp", DPort: config.PortSpec{"80,"}}}, {"unknown icmp type", config.Rule{Proto: "icmp", DPort: config.PortSpec{"bogus"}}}, + {"unknown icmp type with code", config.Rule{Proto: "icmp", DPort: config.PortSpec{"bogus/0"}}}, + {"invalid icmp code", config.Rule{Proto: "icmp", DPort: config.PortSpec{"destination-unreachable/x"}}}, + {"icmp code out of range", config.Rule{Proto: "icmp", DPort: config.PortSpec{"3/256"}}}, + {"unknown proto in list", config.Rule{Proto: "tcp,udpp", DPort: config.PortSpec{"53"}}}, + {"proto number out of range", config.Rule{Proto: "256"}}, + {"dport with icmp in proto list", config.Rule{Proto: "icmp,tcp", DPort: config.PortSpec{"80"}}}, {"ratelimit with port list", config.Rule{Proto: "tcp", DPort: config.PortSpec{"80,443"}, RateLimit: "10/sec"}}, {"connlimit with proto list", config.Rule{Proto: "tcp,udp", DPort: config.PortSpec{"53"}, ConnLimit: "10"}}, } @@ -1734,18 +1740,72 @@ func TestCompile_ListErrors(t *testing.T) { } } -func TestCompile_ListExpansionDiffStable(t *testing.T) { - cfg := listCfg(func(c *config.Config) { - c.Rules = []config.Rule{{Action: config.RuleReject, Source: "net", Dest: "fw", Proto: "tcp,udp", DPort: config.PortSpec{"80,443"}}} - }) - state, err := NewCompiler(cfg).Compile() +func TestCompile_ICMPList(t *testing.T) { + state, err := NewCompiler(listCfg(func(c *config.Config) { + c.Rules = []config.Rule{{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "icmp", DPort: config.PortSpec{"echo-request,echo-reply", "destination-unreachable/4"}}} + })).Compile() if err != nil { t.Fatalf("Compile() error: %v", err) } - if n := len(taggedRules(state, "input", "rule:0")); n != 4 { - t.Fatalf("got %d rule:0 rules, want 4", n) + var got [][]byte + for _, r := range taggedRules(state, "input", "rule:0") { + var tc []byte + for i, e := range r.Exprs { + if p, ok := e.(*expr.Payload); ok && p.Base == expr.PayloadBaseTransportHeader && p.Len == 1 { + tc = append(tc, r.Exprs[i+1].(*expr.Cmp).Data[0]) + } + } + got = append(got, tc) } - if cs := computeDiff(state, state); !cs.Empty() { - t.Errorf("diff not empty:\n%s", cs.Summary()) + want := [][]byte{{8}, {0}, {3, 4}} + if !reflect.DeepEqual(got, want) { + t.Errorf("icmp type/code per rule = %v, want %v", got, want) + } +} + +func TestCompile_ColonRanges(t *testing.T) { + tests := []struct { + name string + mod func(*config.Config) + chain string + tag string + offset uint32 + }{ + {"rule sport", func(c *config.Config) { + c.Rules = []config.Rule{{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "tcp", SPort: config.PortSpec{"1024:2048"}}} + }, "input", "rule:0", 0}, + {"snat sport", func(c *config.Config) { + c.SNAT = []config.SNATRule{{Action: config.SNATMasquerade, Dest: "eth0", Proto: "udp", SPort: config.PortSpec{"1024:2048"}}} + }, "postrouting", "snat:0", 0}, + {"snat dport", func(c *config.Config) { + c.SNAT = []config.SNATRule{{Action: config.SNATMasquerade, Dest: "eth0", Proto: "tcp", DPort: config.PortSpec{"1024:2048"}}} + }, "postrouting", "snat:0", 2}, + {"conntrack dport", func(c *config.Config) { + c.Conntrack = []config.ConntrackRule{{Action: config.ConntrackNoTrack, Proto: "udp", DPort: config.PortSpec{"1024:2048"}}} + }, "prerouting", "conntrack:0:prerouting", 2}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + state, err := NewCompiler(listCfg(tt.mod)).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + rules := taggedRules(state, tt.chain, tt.tag) + if len(rules) != 1 { + t.Fatalf("got %d %s rules, want 1", len(rules), tt.tag) + } + var got []string + ex := rules[0].Exprs + for i, e := range ex { + if p, ok := e.(*expr.Payload); ok && p.Base == expr.PayloadBaseTransportHeader && p.Offset == tt.offset && p.Len == 2 && i+2 < len(ex) { + lo, hi := ex[i+1].(*expr.Cmp), ex[i+2].(*expr.Cmp) + got = append(got, fmt.Sprintf("%d>=%d,%d<=%d", lo.Op, binary.BigEndian.Uint16(lo.Data), hi.Op, binary.BigEndian.Uint16(hi.Data))) + } + } + want := []string{fmt.Sprintf("%d>=1024,%d<=2048", expr.CmpOpGte, expr.CmpOpLte)} + if !reflect.DeepEqual(got, want) { + t.Errorf("range match = %v, want %v", got, want) + } + }) } } From 852d6bf2ca38eb1e94fd3a42a8549c8478c2fb81 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 3 Oct 2026 20:49:54 +1000 Subject: [PATCH 5/7] Resolve common IANA protocol names and reject ports on portless protocols --- internal/nftables/compiler.go | 71 ++++++++++++++---------------- internal/nftables/compiler_test.go | 21 +++++++++ 2 files changed, 54 insertions(+), 38 deletions(-) diff --git a/internal/nftables/compiler.go b/internal/nftables/compiler.go index 2fc1e4d..9bd47eb 100644 --- a/internal/nftables/compiler.go +++ b/internal/nftables/compiler.go @@ -972,7 +972,19 @@ func l4Matches(proto string, dports, sports config.PortSpec) ([]l4Match, error) if proto != "" && p == "" { return nil, fmt.Errorf("empty element in proto list %q", proto) } - isICMP := strings.EqualFold(p, "icmp") || strings.EqualFold(p, "icmpv6") || strings.EqualFold(p, "ipv6-icmp") + var pm []expr.Any + isICMP := false + if p != "" { + n, err := protoNumber(p) + if err != nil { + return nil, err + } + isICMP = n == unix.IPPROTO_ICMP || n == unix.IPPROTO_ICMPV6 + if (len(dports) > 0 && !isICMP || len(sports) > 0) && !hasPorts(n) { + return nil, fmt.Errorf("protocol %q does not support ports", p) + } + pm = matchProtoNum(n) + } parseD := parsePortOrRange if isICMP { if len(protos) > 1 && len(dports) > 0 { @@ -980,14 +992,6 @@ func l4Matches(proto string, dports, sports config.PortSpec) ([]l4Match, error) } parseD = matchICMPType } - var pm []expr.Any - if p != "" { - m, err := matchProto(p) - if err != nil { - return nil, err - } - pm = m - } dalts, err := portAlternatives(dports, parseD) if err != nil { return nil, err @@ -1051,36 +1055,27 @@ func matchIfaceName(input bool, name string) []expr.Any { } } -func matchProto(proto string) ([]expr.Any, error) { - var protoNum byte - switch strings.ToLower(proto) { - case "tcp": - protoNum = unix.IPPROTO_TCP - case "udp": - protoNum = unix.IPPROTO_UDP - case "icmp": - protoNum = unix.IPPROTO_ICMP - case "icmpv6", "ipv6-icmp": - protoNum = unix.IPPROTO_ICMPV6 - case "gre": - protoNum = 47 - case "esp": - protoNum = 50 - case "ah": - protoNum = 51 - case "sctp": - protoNum = unix.IPPROTO_SCTP - default: - n, err := strconv.ParseUint(proto, 10, 8) - if err != nil { - return nil, fmt.Errorf("unknown protocol %q", proto) - } - protoNum = byte(n) +var protoNumbers = map[string]byte{ + "icmp": 1, "igmp": 2, "ipip": 4, "ipencap": 4, "tcp": 6, "udp": 17, + "gre": 47, "esp": 50, "ah": 51, "icmpv6": 58, "ipv6-icmp": 58, + "ospf": 89, "ospfigp": 89, "pim": 103, "vrrp": 112, "l2tp": 115, + "sctp": 132, "udplite": 136, +} + +// protoNumber resolves a common IANA protocol name or a 0-255 number. +func protoNumber(proto string) (byte, error) { + if n, ok := protoNumbers[strings.ToLower(proto)]; ok { + return n, nil } - return []expr.Any{ - &expr.Meta{Key: expr.MetaKeyL4PROTO, Register: 1}, - &expr.Cmp{Op: expr.CmpOpEq, Register: 1, Data: []byte{protoNum}}, - }, nil + n, err := strconv.ParseUint(proto, 10, 8) + if err != nil { + return 0, fmt.Errorf("unknown protocol %q", proto) + } + return byte(n), nil +} + +func hasPorts(proto byte) bool { + return proto == unix.IPPROTO_TCP || proto == unix.IPPROTO_UDP || proto == unix.IPPROTO_SCTP || proto == unix.IPPROTO_UDPLITE } func matchDPort(port uint16) []expr.Any { diff --git a/internal/nftables/compiler_test.go b/internal/nftables/compiler_test.go index 939c4a9..912ce65 100644 --- a/internal/nftables/compiler_test.go +++ b/internal/nftables/compiler_test.go @@ -1581,6 +1581,24 @@ func TestCompile_PortAndProtoLists(t *testing.T) { chain: "prerouting", want: []want{{6, "53"}, {17, "53"}}, }, + { + name: "protocol names", + rule: config.Rule{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "ospf,OSPFIGP,igmp,gre,esp,ah,vrrp,pim,ipencap,ipv6-icmp"}, + chain: "input", + want: []want{{89, ""}, {89, ""}, {2, ""}, {47, ""}, {50, ""}, {51, ""}, {112, ""}, {103, ""}, {4, ""}, {58, ""}}, + }, + { + name: "protocol numbers", + rule: config.Rule{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "0,89,255"}, + chain: "input", + want: []want{{0, ""}, {89, ""}, {255, ""}}, + }, + { + name: "numeric tcp with port", + rule: config.Rule{Action: config.RuleAccept, Source: "net", Dest: "fw", Proto: "6,udplite", DPort: config.PortSpec{"22"}}, + chain: "input", + want: []want{{6, "22"}, {136, "22"}}, + }, } for _, tt := range tests { @@ -1724,6 +1742,9 @@ func TestCompile_ListErrors(t *testing.T) { {"icmp code out of range", config.Rule{Proto: "icmp", DPort: config.PortSpec{"3/256"}}}, {"unknown proto in list", config.Rule{Proto: "tcp,udpp", DPort: config.PortSpec{"53"}}}, {"proto number out of range", config.Rule{Proto: "256"}}, + {"unknown proto name", config.Rule{Proto: "bogus"}}, + {"dport with ospf", config.Rule{Proto: "ospf", DPort: config.PortSpec{"80"}}}, + {"sport with gre", config.Rule{Proto: "gre", SPort: config.PortSpec{"80"}}}, {"dport with icmp in proto list", config.Rule{Proto: "icmp,tcp", DPort: config.PortSpec{"80"}}}, {"ratelimit with port list", config.Rule{Proto: "tcp", DPort: config.PortSpec{"80,443"}, RateLimit: "10/sec"}}, {"connlimit with proto list", config.Rule{Proto: "tcp,udp", DPort: config.PortSpec{"53"}, ConnLimit: "10"}}, From 8efed72c965a8668fab0ba111bb899c352786052 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 3 Oct 2026 20:50:36 +1000 Subject: [PATCH 6/7] Match exact all/any zone tokens, skip only interface-less ip zones, keep DNAT free of rule extras, reject '!' inside address lists --- internal/config/blrules.go | 6 ++++ internal/config/config_test.go | 13 +++++++ internal/config/rules.go | 11 ++++++ internal/nftables/compiler.go | 22 ++++++++---- internal/nftables/compiler_test.go | 58 +++++++++++++++++++++++++++--- 5 files changed, 100 insertions(+), 10 deletions(-) diff --git a/internal/config/blrules.go b/internal/config/blrules.go index f361ea1..4118d22 100644 --- a/internal/config/blrules.go +++ b/internal/config/blrules.go @@ -61,6 +61,9 @@ func (c *Config) validateBlrules() error { if _, ok := c.Zones[zs.Zone]; !ok { return fmt.Errorf("blrules[%d]: source zone %q not defined", i, zs.Zone) } + if !validAddrList(zs.Addr) { + return fmt.Errorf("blrules[%d]: source %q: '!' may only prefix the whole address list", i, zs.Addr) + } } } @@ -70,6 +73,9 @@ func (c *Config) validateBlrules() error { if _, ok := c.Zones[zs.Zone]; !ok { return fmt.Errorf("blrules[%d]: dest zone %q not defined", i, zs.Zone) } + if !validAddrList(zs.Addr) { + return fmt.Errorf("blrules[%d]: dest %q: '!' may only prefix the whole address list", i, zs.Addr) + } } } } diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 012c997..7485bae 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -868,6 +868,19 @@ func TestValidateRules(t *testing.T) { }, wantErr: "dest zone \"missing\" not defined", }, + { + name: "negation prefixing the whole address list is valid", + rules: []Rule{ + {Action: RuleAccept, Source: "net:!192.0.2.1,198.51.100.1", Dest: "fw"}, + }, + }, + { + name: "negation inside an address list", + rules: []Rule{ + {Action: RuleAccept, Source: "net", Dest: "loc:192.0.2.1,!198.51.100.1"}, + }, + wantErr: "'!' may only prefix the whole address list", + }, { name: "all keyword is valid source", rules: []Rule{ diff --git a/internal/config/rules.go b/internal/config/rules.go index 1b36111..fb94e31 100644 --- a/internal/config/rules.go +++ b/internal/config/rules.go @@ -179,6 +179,9 @@ func (c *Config) validateRules() error { if _, ok := c.Zones[zs.Zone]; !ok { return fmt.Errorf("rule[%d]: source zone %q not defined", i, zs.Zone) } + if !validAddrList(zs.Addr) { + return fmt.Errorf("rule[%d]: source %q: '!' may only prefix the whole address list", i, zs.Addr) + } } } @@ -189,6 +192,9 @@ func (c *Config) validateRules() error { if _, ok := c.Zones[zs.Zone]; !ok { return fmt.Errorf("rule[%d]: dest zone %q not defined", i, zs.Zone) } + if !validAddrList(zs.Addr) { + return fmt.Errorf("rule[%d]: dest %q: '!' may only prefix the whole address list", i, zs.Addr) + } } } } @@ -243,6 +249,11 @@ func SplitZoneList(spec string) []ZoneSpec { return out } +// validAddrList reports whether '!' appears only at the start, negating the whole list. +func validAddrList(addr string) bool { + return !strings.Contains(strings.TrimPrefix(addr, "!"), "!") +} + // zoneFromSpec extracts the zone name from a zone spec like "net" or "net:192.168.1.0/24". func zoneFromSpec(spec string) string { for i, c := range spec { diff --git a/internal/nftables/compiler.go b/internal/nftables/compiler.go index 0a20e5a..1d5c409 100644 --- a/internal/nftables/compiler.go +++ b/internal/nftables/compiler.go @@ -15,7 +15,8 @@ import ( ) type Compiler struct { - cfg *config.Config + cfg *config.Config + warned map[string]bool } func NewCompiler(cfg *config.Config) *Compiler { @@ -26,6 +27,7 @@ func (c *Compiler) Compile() (*FirewallState, error) { state := &FirewallState{ Rules: make(map[string][]ManagedRule), } + c.warned = nil c.compileLoopback(state) if err := c.compileConntrackFastPath(state); err != nil { @@ -297,7 +299,9 @@ func (c *Compiler) compileRules(state *FirewallState) error { func (c *Compiler) applyRuleExtras(state *FirewallState, tag string, rule config.Rule) { for chain := range state.Rules { - c.applyChainExtras(state, chain, tag, rule) + if chain != "prerouting" { + c.applyChainExtras(state, chain, tag, rule) + } } } @@ -394,8 +398,8 @@ func specCount(srcSpec, dstSpec string, action config.RuleAction) int { // zoneSpecs expands a comma zone list; "all"/"any" forms keep their own comma (exclusion) syntax. func zoneSpecs(spec string) []config.ZoneSpec { - if strings.HasPrefix(spec, "all") || strings.HasPrefix(spec, "any") { - zone, addr := splitZoneSpec(spec) + zone, addr := splitZoneSpec(spec) + if base, _, _ := strings.Cut(strings.TrimSuffix(zone, "+"), "!"); base == "all" || base == "any" { return []config.ZoneSpec{{Zone: zone, Addr: addr}} } return config.SplitZoneList(spec) @@ -935,8 +939,14 @@ func (c *Compiler) resolveZoneInterfaces(zone string) []string { if len(ifaces) > 0 { return ifaces } - if z, ok := c.cfg.Zones[zone]; ok && z.Type != config.ZoneFirewall && !c.zoneHasHosts(zone) { - slog.Warn("compiler: zone has no interfaces, skipping its rules", "zone", zone) + if z, ok := c.cfg.Zones[zone]; ok && z.Type == config.ZoneIP && !c.zoneHasHosts(zone) { + if !c.warned[zone] { + if c.warned == nil { + c.warned = map[string]bool{} + } + c.warned[zone] = true + slog.Warn("compiler: zone has no interfaces, skipping its rules", "zone", zone) + } return nil } return []string{""} diff --git a/internal/nftables/compiler_test.go b/internal/nftables/compiler_test.go index 8287e49..75c2eac 100644 --- a/internal/nftables/compiler_test.go +++ b/internal/nftables/compiler_test.go @@ -1655,6 +1655,9 @@ func describeRule(r ManagedRule) string { case *expr.Payload: if m.Base == expr.PayloadBaseNetworkHeader && m.Len == 4 { name := map[uint32]string{12: "saddr", 16: "daddr"}[m.Offset] + if cmp.Op == expr.CmpOpNeq { + name = "!" + name + } parts = append(parts, fmt.Sprintf("%s=%d.%d.%d.%d", name, cmp.Data[0], cmp.Data[1], cmp.Data[2], cmp.Data[3])) } } @@ -1664,9 +1667,10 @@ func describeRule(r ManagedRule) string { func TestCompile_CommaZoneLists(t *testing.T) { tests := []struct { - name string - rule config.Rule - want map[string][]string + name string + rule config.Rule + blrule *config.BlruleRule + want map[string][]string }{ { name: "fw in source list goes to output", @@ -1698,6 +1702,31 @@ func TestCompile_CommaZoneLists(t *testing.T) { rule: config.Rule{Action: config.RuleDNAT, Source: "net,lan", Dest: "svr:192.0.2.10", Proto: "tcp", DPort: config.PortSpec{"80"}}, want: map[string][]string{"prerouting": {"iif=eth0", "iif=eth1"}}, }, + { + name: "dnat source address list", + rule: config.Rule{Action: config.RuleDNAT, Source: "net:192.0.2.5,198.51.100.5", Dest: "svr:192.0.2.10", Proto: "tcp", DPort: config.PortSpec{"80"}}, + want: map[string][]string{"prerouting": {"iif=eth0 saddr=192.0.2.5", "iif=eth0 saddr=198.51.100.5"}}, + }, + { + name: "negated address list stays one AND-ed rule", + rule: config.Rule{Action: config.RuleAccept, Source: "net:!192.0.2.5,198.51.100.5", Dest: "fw"}, + want: map[string][]string{"input": {"iif=eth0 !saddr=192.0.2.5 !saddr=198.51.100.5"}}, + }, + { + name: "zone named like all/any keyword is a plain zone", + rule: config.Rule{Action: config.RuleAccept, Source: "lan", Dest: "anycast,net"}, + want: map[string][]string{"forward": {"iif=eth1 oif=eth3", "iif=eth1 oif=eth0"}}, + }, + { + name: "interface-less ipsec zone keeps zone-agnostic rule, ip zone skipped", + rule: config.Rule{Action: config.RuleAccept, Source: "lan", Dest: "vpn,dmz"}, + want: map[string][]string{"forward": {"iif=eth1"}}, + }, + { + name: "blrule zone list", + blrule: &config.BlruleRule{Action: config.BlruleDrop, Source: "net,anycast", Dest: "fw"}, + want: map[string][]string{"input": {"iif=eth0", "iif=eth3"}}, + }, } for _, tt := range tests { @@ -1707,13 +1736,19 @@ func TestCompile_CommaZoneLists(t *testing.T) { Zones: map[string]config.Zone{ "fw": {Type: config.ZoneFirewall}, "net": {Type: config.ZoneIP}, "lan": {Type: config.ZoneIP}, "svr": {Type: config.ZoneIP}, "dmz": {Type: config.ZoneIP}, + "anycast": {Type: config.ZoneIP}, "vpn": {Type: config.ZoneIPSec}, }, Interfaces: []config.Interface{ {Zone: "net", Interface: "eth0"}, {Zone: "lan", Interface: "eth1"}, {Zone: "svr", Interface: "eth2"}, + {Zone: "anycast", Interface: "eth3"}, }, Rules: []config.Rule{tt.rule}, PortGroups: make(map[string]config.PortGroup), } + tag := "rule:0" + if tt.blrule != nil { + cfg.Rules, cfg.Blrules, tag = nil, []config.BlruleRule{*tt.blrule}, "blrule:0" + } state, err := NewCompiler(cfg).Compile() if err != nil { t.Fatalf("Compile() error: %v", err) @@ -1721,7 +1756,7 @@ func TestCompile_CommaZoneLists(t *testing.T) { got := map[string][]string{} for chain, rules := range state.Rules { for _, r := range rules { - if r.Tag == "rule:0" { + if r.Tag == tag { got[chain] = append(got[chain], describeRule(r)) } } @@ -1789,6 +1824,21 @@ func TestCompile_ListExpansionCounts(t *testing.T) { } } +func TestCompile_DNATGetsNoRuleExtras(t *testing.T) { + compile := func(mark string) []expr.Any { + state, err := NewCompiler(listCfg(func(c *config.Config) { + c.Rules = []config.Rule{{Action: config.RuleDNAT, Source: "net", Dest: "fw:192.0.2.10", Proto: "tcp", DPort: config.PortSpec{"80"}, Mark: mark}} + })).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + return state.Rules["prerouting"][len(state.Rules["prerouting"])-1].Exprs + } + if plain, marked := compile(""), compile("0x1"); !reflect.DeepEqual(plain, marked) { + t.Errorf("DNAT prerouting rule changed by mark extra: %d exprs vs %d", len(plain), len(marked)) + } +} + func TestCompile_CommaZoneListLimitErrors(t *testing.T) { for _, r := range []config.Rule{ {Action: config.RuleAccept, Source: "net", Dest: "fw,lan", RateLimit: "10/sec:5"}, From 457056d58a7531fac1e4e93f8e533fde7311bba4 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 3 Oct 2026 20:51:25 +1000 Subject: [PATCH 7/7] Pick reject type by resolved protocol number --- internal/nftables/compiler.go | 16 ++++++---- internal/nftables/compiler_test.go | 51 ++++++++++++++++++------------ 2 files changed, 40 insertions(+), 27 deletions(-) diff --git a/internal/nftables/compiler.go b/internal/nftables/compiler.go index 9bd47eb..2994a80 100644 --- a/internal/nftables/compiler.go +++ b/internal/nftables/compiler.go @@ -955,7 +955,7 @@ func (c *Compiler) buildMatchExprs(srcIface, dstIface, chain, proto string, dpor } type l4Match struct { - proto string + proto byte exprs []expr.Any } @@ -973,9 +973,11 @@ func l4Matches(proto string, dports, sports config.PortSpec) ([]l4Match, error) return nil, fmt.Errorf("empty element in proto list %q", proto) } var pm []expr.Any + var n byte isICMP := false if p != "" { - n, err := protoNumber(p) + var err error + n, err = protoNumber(p) if err != nil { return nil, err } @@ -1003,7 +1005,7 @@ func l4Matches(proto string, dports, sports config.PortSpec) ([]l4Match, error) for _, d := range dalts { for _, sp := range salts { e := append(append(append([]expr.Any{}, pm...), d...), sp...) - out = append(out, l4Match{proto: p, exprs: e}) + out = append(out, l4Match{proto: n, exprs: e}) } } } @@ -1665,7 +1667,7 @@ func logLevelToNF(level string) expr.LogLevel { } } -func actionVerdict(action config.RuleAction, proto string, family config.AddressFamily) []expr.Any { +func actionVerdict(action config.RuleAction, proto byte, family config.AddressFamily) []expr.Any { switch action { case config.RuleAccept: return []expr.Any{&expr.Verdict{Kind: expr.VerdictAccept}} @@ -1690,8 +1692,8 @@ func actionVerdict(action config.RuleAction, proto string, family config.Address } } -func rejectExprs(proto string, family config.AddressFamily) []expr.Any { - if strings.ToLower(proto) == "tcp" { +func rejectExprs(proto byte, family config.AddressFamily) []expr.Any { + if proto == unix.IPPROTO_TCP { return []expr.Any{&expr.Reject{ Type: unix.NFT_REJECT_TCP_RST, Code: 0, @@ -1710,7 +1712,7 @@ func policyVerdict(action config.PolicyAction, family config.AddressFamily) []ex case config.PolicyDrop: return []expr.Any{&expr.Verdict{Kind: expr.VerdictDrop}} case config.PolicyReject: - return rejectExprs("", family) + return rejectExprs(0, family) default: return []expr.Any{&expr.Verdict{Kind: expr.VerdictDrop}} } diff --git a/internal/nftables/compiler_test.go b/internal/nftables/compiler_test.go index 912ce65..1a221b5 100644 --- a/internal/nftables/compiler_test.go +++ b/internal/nftables/compiler_test.go @@ -978,7 +978,7 @@ func TestNegatedAddress(t *testing.T) { } func TestRejectTCPRST(t *testing.T) { - exprs := rejectExprs("tcp", config.FamilyINET) + exprs := rejectExprs(unix.IPPROTO_TCP, config.FamilyINET) if len(exprs) != 1 { t.Fatalf("expected 1 expr, got %d", len(exprs)) } @@ -987,7 +987,7 @@ func TestRejectTCPRST(t *testing.T) { t.Errorf("TCP reject should use NFT_REJECT_TCP_RST (1), got %d", rej.Type) } - exprs = rejectExprs("udp", config.FamilyINET) + exprs = rejectExprs(unix.IPPROTO_UDP, config.FamilyINET) rej = exprs[0].(*expr.Reject) if rej.Type != 2 { t.Errorf("non-TCP reject should use NFT_REJECT_ICMPX_UNREACH (2), got %d", rej.Type) @@ -1705,25 +1705,36 @@ func TestCompile_ListExpansionCounts(t *testing.T) { } func TestCompile_RejectPerProto(t *testing.T) { - state, err := NewCompiler(listCfg(func(c *config.Config) { - c.Rules = []config.Rule{{Action: config.RuleReject, Source: "net", Dest: "fw", Proto: "tcp,udp", DPort: config.PortSpec{"53"}}} - })).Compile() - if err != nil { - t.Fatalf("Compile() error: %v", err) + tests := []struct { + proto string + want []uint32 + }{ + {"tcp,udp", []uint32{unix.NFT_REJECT_TCP_RST, unix.NFT_REJECT_ICMPX_UNREACH}}, + {"6", []uint32{unix.NFT_REJECT_TCP_RST}}, + {"6,17", []uint32{unix.NFT_REJECT_TCP_RST, unix.NFT_REJECT_ICMPX_UNREACH}}, } - rules := taggedRules(state, "input", "rule:0") - if len(rules) != 2 { - t.Fatalf("got %d rules, want 2", len(rules)) - } - want := []uint32{unix.NFT_REJECT_TCP_RST, unix.NFT_REJECT_ICMPX_UNREACH} - for i, r := range rules { - rej, ok := r.Exprs[len(r.Exprs)-1].(*expr.Reject) - if !ok { - t.Fatalf("rule %d: last expr %T, want *expr.Reject", i, r.Exprs[len(r.Exprs)-1]) - } - if rej.Type != want[i] { - t.Errorf("rule %d: reject type %d, want %d", i, rej.Type, want[i]) - } + for _, tt := range tests { + t.Run(tt.proto, func(t *testing.T) { + state, err := NewCompiler(listCfg(func(c *config.Config) { + c.Rules = []config.Rule{{Action: config.RuleReject, Source: "net", Dest: "fw", Proto: tt.proto, DPort: config.PortSpec{"53"}}} + })).Compile() + if err != nil { + t.Fatalf("Compile() error: %v", err) + } + rules := taggedRules(state, "input", "rule:0") + if len(rules) != len(tt.want) { + t.Fatalf("got %d rules, want %d", len(rules), len(tt.want)) + } + for i, r := range rules { + rej, ok := r.Exprs[len(r.Exprs)-1].(*expr.Reject) + if !ok { + t.Fatalf("rule %d: last expr %T, want *expr.Reject", i, r.Exprs[len(r.Exprs)-1]) + } + if rej.Type != tt.want[i] { + t.Errorf("rule %d: reject type %d, want %d", i, rej.Type, tt.want[i]) + } + } + }) } }