Move helper NAT management into Go
Remove the last shell-owned NAT surface by extracting the iptables logic into a shared Go package and using it from both bangerd and a hidden helper bridge in the CLI. Route customize.sh and interactive.sh through banger internal nat up/down so the remaining shell helpers reuse the same rule logic, resolve the local banger binary explicitly, and tear NAT back down during cleanup. Drop nat.sh from the runtime bundle and docs now that NAT is Go-managed everywhere, and keep coverage aligned with the new shared package and helper command. Validation: go test ./..., bash -n customize.sh interactive.sh verify.sh, make build, and a live ./verify.sh --nat run that installed host rules, reached outbound network access, and cleaned them up successfully.
This commit is contained in:
parent
60294e8c90
commit
430f66d5dd
13 changed files with 378 additions and 250 deletions
145
internal/hostnat/hostnat.go
Normal file
145
internal/hostnat/hostnat.go
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
package hostnat
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"banger/internal/system"
|
||||
)
|
||||
|
||||
type Rule struct {
|
||||
Table string
|
||||
Chain string
|
||||
Args []string
|
||||
}
|
||||
|
||||
func Ensure(ctx context.Context, runner system.CommandRunner, guestIP, tapDevice string, enable bool) error {
|
||||
uplink, err := DefaultUplink(ctx, runner)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
rules, err := Rules(guestIP, tapDevice, uplink)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if enable {
|
||||
if _, err := runner.RunSudo(ctx, "sysctl", "-w", "net.ipv4.ip_forward=1"); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, rule := range rules {
|
||||
if err := addRule(ctx, runner, rule); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
for _, rule := range rules {
|
||||
if err := removeRule(ctx, runner, rule); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func DefaultUplink(ctx context.Context, runner system.CommandRunner) (string, error) {
|
||||
out, err := runner.Run(ctx, "ip", "route", "show", "default")
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return ParseDefaultUplink(string(out))
|
||||
}
|
||||
|
||||
func ParseDefaultUplink(output string) (string, error) {
|
||||
for _, line := range strings.Split(output, "\n") {
|
||||
fields := strings.Fields(line)
|
||||
if len(fields) == 0 || fields[0] != "default" {
|
||||
continue
|
||||
}
|
||||
for i := 0; i < len(fields)-1; i++ {
|
||||
if fields[i] == "dev" && fields[i+1] != "" {
|
||||
return fields[i+1], nil
|
||||
}
|
||||
}
|
||||
}
|
||||
return "", errors.New("failed to detect uplink interface")
|
||||
}
|
||||
|
||||
func Rules(guestIP, tapDevice, uplink string) ([]Rule, error) {
|
||||
guestIP = strings.TrimSpace(guestIP)
|
||||
if guestIP == "" {
|
||||
return nil, errors.New("nat requires a guest IP")
|
||||
}
|
||||
tapDevice = strings.TrimSpace(tapDevice)
|
||||
if tapDevice == "" {
|
||||
return nil, errors.New("nat requires a tap device")
|
||||
}
|
||||
uplink = strings.TrimSpace(uplink)
|
||||
if uplink == "" {
|
||||
return nil, errors.New("nat requires an uplink interface")
|
||||
}
|
||||
guestCIDR := guestIP + "/32"
|
||||
return []Rule{
|
||||
{
|
||||
Table: "nat",
|
||||
Chain: "POSTROUTING",
|
||||
Args: []string{"-s", guestCIDR, "-o", uplink, "-j", "MASQUERADE"},
|
||||
},
|
||||
{
|
||||
Chain: "FORWARD",
|
||||
Args: []string{"-i", tapDevice, "-o", uplink, "-j", "ACCEPT"},
|
||||
},
|
||||
{
|
||||
Chain: "FORWARD",
|
||||
Args: []string{"-i", uplink, "-o", tapDevice, "-m", "state", "--state", "RELATED,ESTABLISHED", "-j", "ACCEPT"},
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
|
||||
func RuleArgs(action string, rule Rule) []string {
|
||||
args := make([]string, 0, len(rule.Args)+4)
|
||||
if rule.Table != "" {
|
||||
args = append(args, "-t", rule.Table)
|
||||
}
|
||||
args = append(args, action, rule.Chain)
|
||||
args = append(args, rule.Args...)
|
||||
return args
|
||||
}
|
||||
|
||||
func AddPlan(rules []Rule) [][]string {
|
||||
plan := make([][]string, 0, len(rules)+1)
|
||||
plan = append(plan, []string{"sysctl", "-w", "net.ipv4.ip_forward=1"})
|
||||
for _, rule := range rules {
|
||||
plan = append(plan, RuleArgs("-A", rule))
|
||||
}
|
||||
return plan
|
||||
}
|
||||
|
||||
func RemovePlan(rules []Rule) [][]string {
|
||||
plan := make([][]string, 0, len(rules))
|
||||
for _, rule := range rules {
|
||||
plan = append(plan, RuleArgs("-D", rule))
|
||||
}
|
||||
return plan
|
||||
}
|
||||
|
||||
func RuleKey(rule Rule) string {
|
||||
return fmt.Sprintf("%s:%s:%s", rule.Table, rule.Chain, strings.Join(rule.Args, " "))
|
||||
}
|
||||
|
||||
func addRule(ctx context.Context, runner system.CommandRunner, rule Rule) error {
|
||||
if _, err := runner.RunSudo(ctx, append([]string{"iptables"}, RuleArgs("-C", rule)...)...); err == nil {
|
||||
return nil
|
||||
}
|
||||
_, err := runner.RunSudo(ctx, append([]string{"iptables"}, RuleArgs("-A", rule)...)...)
|
||||
return err
|
||||
}
|
||||
|
||||
func removeRule(ctx context.Context, runner system.CommandRunner, rule Rule) error {
|
||||
if _, err := runner.RunSudo(ctx, append([]string{"iptables"}, RuleArgs("-C", rule)...)...); err != nil {
|
||||
return nil
|
||||
}
|
||||
_, err := runner.RunSudo(ctx, append([]string{"iptables"}, RuleArgs("-D", rule)...)...)
|
||||
return err
|
||||
}
|
||||
83
internal/hostnat/hostnat_test.go
Normal file
83
internal/hostnat/hostnat_test.go
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
package hostnat
|
||||
|
||||
import (
|
||||
"slices"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestParseDefaultUplink(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
output := "default via 192.168.1.1 dev enp5s0 proto dhcp src 192.168.1.40 metric 100\n"
|
||||
uplink, err := ParseDefaultUplink(output)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseDefaultUplink returned error: %v", err)
|
||||
}
|
||||
if uplink != "enp5s0" {
|
||||
t.Fatalf("uplink = %q, want enp5s0", uplink)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseDefaultUplinkFailsWithoutRoute(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
if _, err := ParseDefaultUplink("10.0.0.0/24 dev br-fc proto kernel scope link src 10.0.0.1\n"); err == nil {
|
||||
t.Fatal("expected ParseDefaultUplink to fail without a default route")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRulesRequireRuntimeData(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
guestIP string
|
||||
tapDevice string
|
||||
uplink string
|
||||
}{
|
||||
{name: "guest ip", tapDevice: "tap-fc-abcd1234", uplink: "eth0"},
|
||||
{name: "tap", guestIP: "172.16.0.8", uplink: "eth0"},
|
||||
{name: "uplink", guestIP: "172.16.0.8", tapDevice: "tap-fc-abcd1234"},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
tt := tt
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
if _, err := Rules(tt.guestIP, tt.tapDevice, tt.uplink); err == nil {
|
||||
t.Fatalf("expected Rules to fail for missing %s", tt.name)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRulePlans(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
rules, err := Rules("172.16.0.8", "tap-fc-abcd1234", "eth0")
|
||||
if err != nil {
|
||||
t.Fatalf("Rules returned error: %v", err)
|
||||
}
|
||||
if len(rules) != 3 {
|
||||
t.Fatalf("rule count = %d, want 3", len(rules))
|
||||
}
|
||||
|
||||
if got, want := RuleArgs("-A", rules[0]), []string{"-t", "nat", "-A", "POSTROUTING", "-s", "172.16.0.8/32", "-o", "eth0", "-j", "MASQUERADE"}; !slices.Equal(got, want) {
|
||||
t.Fatalf("postrouting args = %v, want %v", got, want)
|
||||
}
|
||||
if got, want := RuleArgs("-A", rules[1]), []string{"-A", "FORWARD", "-i", "tap-fc-abcd1234", "-o", "eth0", "-j", "ACCEPT"}; !slices.Equal(got, want) {
|
||||
t.Fatalf("forward-out args = %v, want %v", got, want)
|
||||
}
|
||||
if got, want := RuleArgs("-A", rules[2]), []string{"-A", "FORWARD", "-i", "eth0", "-o", "tap-fc-abcd1234", "-m", "state", "--state", "RELATED,ESTABLISHED", "-j", "ACCEPT"}; !slices.Equal(got, want) {
|
||||
t.Fatalf("forward-in args = %v, want %v", got, want)
|
||||
}
|
||||
|
||||
addPlan := AddPlan(rules)
|
||||
if got, want := addPlan[0], []string{"sysctl", "-w", "net.ipv4.ip_forward=1"}; !slices.Equal(got, want) {
|
||||
t.Fatalf("sysctl command = %v, want %v", got, want)
|
||||
}
|
||||
removePlan := RemovePlan(rules)
|
||||
if got, want := removePlan[0], []string{"-t", "nat", "-D", "POSTROUTING", "-s", "172.16.0.8/32", "-o", "eth0", "-j", "MASQUERADE"}; !slices.Equal(got, want) {
|
||||
t.Fatalf("remove NAT command = %v, want %v", got, want)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue