github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix kube-proxy to use proper iptables commands for IPv6 operation 

For iptables save and restore operations, kube-proxy currently uses
the IPv4 versions of the iptables save and restore utilities
(iptables-save and iptables-restore, respectively). For IPv6 operation,
the IPv6 versions of these utilities needs to be used
(ip6tables-save and ip6tables-restore, respectively).

Both this change and PR #48551 are needed to get Kubernetes services
to work in an IPv6-only Kubernetes cluster (along with setting
'--bind-address ::0' on the kube-proxy command line. This change
was alluded to in a discussion on services for issue #1443.

fixes #50474
pull/6/head
Dane LeBlanc 2017-08-10 19:12:42 -04:00
parent f557e0f7e3
commit b45a406aca
2 changed files with 207 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pkg/util/iptables/iptables.go
View File

@ -94,10 +94,12 @@ const (
) )
const ( const (
cmdIPTablesSave string = "iptables-save" cmdIPTablesSave string = "iptables-save"
cmdIPTablesRestore string = "iptables-restore" cmdIPTablesRestore string = "iptables-restore"
cmdIPTables string = "iptables" cmdIPTables string = "iptables"
cmdIp6tables string = "ip6tables" cmdIP6TablesRestore string = "ip6tables-restore"
cmdIP6TablesSave string = "ip6tables-save"
cmdIP6Tables string = "ip6tables"
) )
// Option flag for Restore // Option flag for Restore
@ -140,7 +142,7 @@ type runner struct {
// newInternal returns a new Interface which will exec iptables, and allows the // newInternal returns a new Interface which will exec iptables, and allows the
// caller to change the iptables-restore lockfile path // caller to change the iptables-restore lockfile path
func newInternal(exec utilexec.Interface, dbus utildbus.Interface, protocol Protocol, lockfilePath string) Interface { func newInternal(exec utilexec.Interface, dbus utildbus.Interface, protocol Protocol, lockfilePath string) Interface {
vstring, err := getIPTablesVersionString(exec) vstring, err := getIPTablesVersionString(exec, protocol)
if err != nil { if err != nil {
glog.Warningf("Error checking iptables version, assuming version at least %s: %v", MinCheckVersion, err) glog.Warningf("Error checking iptables version, assuming version at least %s: %v", MinCheckVersion, err)
vstring = MinCheckVersion vstring = MinCheckVersion
@ -156,7 +158,7 @@ func newInternal(exec utilexec.Interface, dbus utildbus.Interface, protocol Prot
protocol: protocol, protocol: protocol,
hasCheck: getIPTablesHasCheckCommand(vstring), hasCheck: getIPTablesHasCheckCommand(vstring),
waitFlag: getIPTablesWaitFlag(vstring), waitFlag: getIPTablesWaitFlag(vstring),
restoreWaitFlag: getIPTablesRestoreWaitFlag(exec), restoreWaitFlag: getIPTablesRestoreWaitFlag(exec, protocol),
lockfilePath: lockfilePath, lockfilePath: lockfilePath,
} }
// TODO this needs to be moved to a separate Start() or Run() function so that New() has zero side // TODO this needs to be moved to a separate Start() or Run() function so that New() has zero side
@ -207,7 +209,7 @@ func (runner *runner) connectToFirewallD() {
// GetVersion returns the version string. // GetVersion returns the version string.
func (runner *runner) GetVersion() (string, error) { func (runner *runner) GetVersion() (string, error) {
return getIPTablesVersionString(runner.exec) return getIPTablesVersionString(runner.exec, runner.protocol)
} }
// EnsureChain is part of Interface. // EnsureChain is part of Interface.
@ -310,9 +312,10 @@ func (runner *runner) SaveInto(table Table, buffer *bytes.Buffer) error {
defer runner.mu.Unlock() defer runner.mu.Unlock()
// run and return // run and return
iptablesSaveCmd := iptablesSaveCommand(runner.protocol)
args := []string{"-t", string(table)} args := []string{"-t", string(table)}
glog.V(4).Infof("running iptables-save %v", args) glog.V(4).Infof("running %s %v", iptablesSaveCmd, args)
cmd := runner.exec.Command(cmdIPTablesSave, args...) cmd := runner.exec.Command(iptablesSaveCmd, args...)
// Since CombinedOutput() doesn't support redirecting it to a buffer, // Since CombinedOutput() doesn't support redirecting it to a buffer,
// we need to workaround it by redirecting stdout and stderr to buffer // we need to workaround it by redirecting stdout and stderr to buffer
// and explicitly calling Run() [CombinedOutput() underneath itself // and explicitly calling Run() [CombinedOutput() underneath itself
@ -370,8 +373,9 @@ func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFla
// run the command and return the output or an error including the output and error // run the command and return the output or an error including the output and error
fullArgs := append(runner.restoreWaitFlag, args...) fullArgs := append(runner.restoreWaitFlag, args...)
glog.V(4).Infof("running iptables-restore %v", fullArgs) iptablesRestoreCmd := iptablesRestoreCommand(runner.protocol)
cmd := runner.exec.Command(cmdIPTablesRestore, fullArgs...) glog.V(4).Infof("running %s %v", iptablesRestoreCmd, fullArgs)
cmd := runner.exec.Command(iptablesRestoreCmd, fullArgs...)
cmd.SetStdin(bytes.NewBuffer(data)) cmd.SetStdin(bytes.NewBuffer(data))
b, err := cmd.CombinedOutput() b, err := cmd.CombinedOutput()
if err != nil { if err != nil {
@ -380,17 +384,32 @@ func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFla
return nil return nil
} }
func (runner *runner) iptablesCommand() string { func iptablesSaveCommand(protocol Protocol) string {
if runner.IsIpv6() { if protocol == ProtocolIpv6 {
return cmdIp6tables return cmdIP6TablesSave
} else {
return cmdIPTablesSave
}
}
func iptablesRestoreCommand(protocol Protocol) string {
if protocol == ProtocolIpv6 {
return cmdIP6TablesRestore
} else {
return cmdIPTablesRestore
}
}
func iptablesCommand(protocol Protocol) string {
if protocol == ProtocolIpv6 {
return cmdIP6Tables
} else { } else {
return cmdIPTables return cmdIPTables
} }
} }
func (runner *runner) run(op operation, args []string) ([]byte, error) { func (runner *runner) run(op operation, args []string) ([]byte, error) {
iptablesCmd := runner.iptablesCommand() iptablesCmd := iptablesCommand(runner.protocol)
fullArgs := append(runner.waitFlag, string(op)) fullArgs := append(runner.waitFlag, string(op))
fullArgs = append(fullArgs, args...) fullArgs = append(fullArgs, args...)
glog.V(5).Infof("running iptables %s %v", string(op), args) glog.V(5).Infof("running iptables %s %v", string(op), args)
@ -418,8 +437,9 @@ func trimhex(s string) string {
// Present for compatibility with <1.4.11 versions of iptables. This is full // Present for compatibility with <1.4.11 versions of iptables. This is full
// of hack and half-measures. We should nix this ASAP. // of hack and half-measures. We should nix this ASAP.
func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...string) (bool, error) { func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...string) (bool, error) {
glog.V(1).Infof("running iptables-save -t %s", string(table)) iptablesSaveCmd := iptablesSaveCommand(runner.protocol)
out, err := runner.exec.Command(cmdIPTablesSave, "-t", string(table)).CombinedOutput() glog.V(1).Infof("running %s -t %s", iptablesSaveCmd, string(table))
out, err := runner.exec.Command(iptablesSaveCmd, "-t", string(table)).CombinedOutput()
if err != nil { if err != nil {
return false, fmt.Errorf("error checking rule: %v", err) return false, fmt.Errorf("error checking rule: %v", err)
} }
@ -540,9 +560,10 @@ func getIPTablesWaitFlag(vstring string) []string {
// getIPTablesVersionString runs "iptables --version" to get the version string // getIPTablesVersionString runs "iptables --version" to get the version string
// in the form "X.X.X" // in the form "X.X.X"
func getIPTablesVersionString(exec utilexec.Interface) (string, error) { func getIPTablesVersionString(exec utilexec.Interface, protocol Protocol) (string, error) {
// this doesn't access mutable state so we don't need to use the interface / runner // this doesn't access mutable state so we don't need to use the interface / runner
bytes, err := exec.Command(cmdIPTables, "--version").CombinedOutput() iptablesCmd := iptablesCommand(protocol)
bytes, err := exec.Command(iptablesCmd, "--version").CombinedOutput()
if err != nil { if err != nil {
return "", err return "", err
} }
@ -558,8 +579,8 @@ func getIPTablesVersionString(exec utilexec.Interface) (string, error) {
// --wait support landed in v1.6.1+ right before --version support, so // --wait support landed in v1.6.1+ right before --version support, so
// any version of iptables-restore that supports --version will also // any version of iptables-restore that supports --version will also
// support --wait // support --wait
func getIPTablesRestoreWaitFlag(exec utilexec.Interface) []string { func getIPTablesRestoreWaitFlag(exec utilexec.Interface, protocol Protocol) []string {
vstring, err := getIPTablesRestoreVersionString(exec) vstring, err := getIPTablesRestoreVersionString(exec, protocol)
if err != nil || vstring == "" { if err != nil || vstring == "" {
glog.V(3).Infof("couldn't get iptables-restore version; assuming it doesn't support --wait") glog.V(3).Infof("couldn't get iptables-restore version; assuming it doesn't support --wait")
return nil return nil
@ -574,13 +595,14 @@ func getIPTablesRestoreWaitFlag(exec utilexec.Interface) []string {
// getIPTablesRestoreVersionString runs "iptables-restore --version" to get the version string // getIPTablesRestoreVersionString runs "iptables-restore --version" to get the version string
// in the form "X.X.X" // in the form "X.X.X"
func getIPTablesRestoreVersionString(exec utilexec.Interface) (string, error) { func getIPTablesRestoreVersionString(exec utilexec.Interface, protocol Protocol) (string, error) {
// this doesn't access mutable state so we don't need to use the interface / runner // this doesn't access mutable state so we don't need to use the interface / runner
// iptables-restore hasn't always had --version, and worse complains // iptables-restore hasn't always had --version, and worse complains
// about unrecognized commands but doesn't exit when it gets them. // about unrecognized commands but doesn't exit when it gets them.
// Work around that by setting stdin to nothing so it exits immediately. // Work around that by setting stdin to nothing so it exits immediately.
cmd := exec.Command(cmdIPTablesRestore, "--version") iptablesRestoreCmd := iptablesRestoreCommand(protocol)
cmd := exec.Command(iptablesRestoreCmd, "--version")
cmd.SetStdin(bytes.NewReader([]byte{})) cmd.SetStdin(bytes.NewReader([]byte{}))
bytes, err := cmd.CombinedOutput() bytes, err := cmd.CombinedOutput()
if err != nil { if err != nil {

211
pkg/util/iptables/iptables_test.go
View File

@ -20,6 +20,7 @@ package iptables
import ( import (
"bytes" "bytes"
"fmt"
"net" "net"
"os" "os"
"strings" "strings"
@ -34,17 +35,71 @@ import (
const TestLockfilePath = "xtables.lock" const TestLockfilePath = "xtables.lock"
func getIPTablesCommand(protocol Protocol) string { func protocolStr(protocol Protocol) string {
if protocol == ProtocolIpv4 { if protocol == ProtocolIpv4 {
return cmdIPTables return "IPv4"
} }
if protocol == ProtocolIpv6 { return "IPv6"
return cmdIp6tables }
func testIPTablesVersionCmds(t *testing.T, protocol Protocol) {
version := " v1.9.22"
iptablesCmd := iptablesCommand(protocol)
iptablesRestoreCmd := iptablesRestoreCommand(protocol)
protoStr := protocolStr(protocol)
fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{
// iptables version response (for runner instantiation)
func() ([]byte, error) { return []byte(iptablesCmd + version), nil },
// iptables-restore version response (for runner instantiation)
func() ([]byte, error) { return []byte(iptablesRestoreCmd + version), nil },
// iptables version response (for call to runner.GetVersion())
func() ([]byte, error) { return []byte(iptablesCmd + version), nil },
},
} }
panic("Unknown protocol") fexec := fakeexec.FakeExec{
CommandScript: []fakeexec.FakeCommandAction{
func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
},
}
runner := New(&fexec, dbus.NewFake(nil, nil), protocol)
defer runner.Destroy()
// Check that proper iptables version command was used during runner instantiation
if !sets.NewString(fcmd.CombinedOutputLog[0]...).HasAll(iptablesCmd, "--version") {
t.Errorf("%s runner instantiate: Expected cmd '%s --version', Got '%s'", protoStr, iptablesCmd, fcmd.CombinedOutputLog[0])
}
// Check that proper iptables restore version command was used during runner instantiation
if !sets.NewString(fcmd.CombinedOutputLog[1]...).HasAll(iptablesRestoreCmd, "--version") {
t.Errorf("%s runner instantiate: Expected cmd '%s --version', Got '%s'", protoStr, iptablesRestoreCmd, fcmd.CombinedOutputLog[1])
}
_, err := runner.GetVersion()
if err != nil {
t.Errorf("%s GetVersion: Expected success, got %v", protoStr, err)
}
// Check that proper iptables version command was used for runner.GetVersion
if !sets.NewString(fcmd.CombinedOutputLog[2]...).HasAll(iptablesCmd, "--version") {
t.Errorf("%s GetVersion: Expected cmd '%s --version', Got '%s'", protoStr, iptablesCmd, fcmd.CombinedOutputLog[2])
}
}
func TestIPTablesVersionCmdsIPv4(t *testing.T) {
testIPTablesVersionCmds(t, ProtocolIpv4)
}
func TestIPTablesVersionCmdsIPv6(t *testing.T) {
testIPTablesVersionCmds(t, ProtocolIpv6)
} }
func testEnsureChain(t *testing.T, protocol Protocol) { func testEnsureChain(t *testing.T, protocol Protocol) {
protoStr := protocolStr(protocol)
fcmd := fakeexec.FakeCmd{ fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{ CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{
// iptables version check // iptables version check
@ -73,30 +128,30 @@ func testEnsureChain(t *testing.T, protocol Protocol) {
// Success. // Success.
exists, err := runner.EnsureChain(TableNAT, Chain("FOOBAR")) exists, err := runner.EnsureChain(TableNAT, Chain("FOOBAR"))
if err != nil { if err != nil {
t.Errorf("expected success, got %v", err) t.Errorf("%s new chain: Expected success, got %v", protoStr, err)
} }
if exists { if exists {
t.Errorf("expected exists = false") t.Errorf("%s new chain: Expected exists = false", protoStr)
} }
if fcmd.CombinedOutputCalls != 3 { if fcmd.CombinedOutputCalls != 3 {
t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) t.Errorf("%s new chain: Expected 3 CombinedOutput() calls, got %d", protoStr, fcmd.CombinedOutputCalls)
} }
cmd := getIPTablesCommand(protocol) cmd := iptablesCommand(protocol)
if !sets.NewString(fcmd.CombinedOutputLog[2]...).HasAll(cmd, "-t", "nat", "-N", "FOOBAR") { if !sets.NewString(fcmd.CombinedOutputLog[2]...).HasAll(cmd, "-t", "nat", "-N", "FOOBAR") {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2]) t.Errorf("%s new chain: Expected cmd containing '%s -t nat -N FOOBAR', got %s", protoStr, cmd, fcmd.CombinedOutputLog[2])
} }
// Exists. // Exists.
exists, err = runner.EnsureChain(TableNAT, Chain("FOOBAR")) exists, err = runner.EnsureChain(TableNAT, Chain("FOOBAR"))
if err != nil { if err != nil {
t.Errorf("expected success, got %v", err) t.Errorf("%s existing chain: Expected success, got %v", protoStr, err)
} }
if !exists { if !exists {
t.Errorf("expected exists = true") t.Errorf("%s existing chain: Expected exists = true", protoStr)
} }
// Failure. // Simulate failure.
_, err = runner.EnsureChain(TableNAT, Chain("FOOBAR")) _, err = runner.EnsureChain(TableNAT, Chain("FOOBAR"))
if err == nil { if err == nil {
t.Errorf("expected failure") t.Errorf("%s: Expected failure", protoStr)
} }
} }
@ -500,7 +555,7 @@ func TestGetIPTablesHasCheckCommand(t *testing.T) {
func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) }, func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
}, },
} }
version, err := getIPTablesVersionString(&fexec) version, err := getIPTablesVersionString(&fexec, ProtocolIpv4)
if (err != nil) != testCase.Err { if (err != nil) != testCase.Err {
t.Errorf("Expected error: %v, Got error: %v", testCase.Err, err) t.Errorf("Expected error: %v, Got error: %v", testCase.Err, err)
} }
@ -513,8 +568,37 @@ func TestGetIPTablesHasCheckCommand(t *testing.T) {
} }
} }
func TestIPTablesCommands(t *testing.T) {
testCases := []struct {
funcName string
protocol Protocol
expectedCmd string
}{
{"iptablesCommand", ProtocolIpv4, cmdIPTables},
{"iptablesCommand", ProtocolIpv6, cmdIP6Tables},
{"iptablesSaveCommand", ProtocolIpv4, cmdIPTablesSave},
{"iptablesSaveCommand", ProtocolIpv6, cmdIP6TablesSave},
{"iptablesRestoreCommand", ProtocolIpv4, cmdIPTablesRestore},
{"iptablesRestoreCommand", ProtocolIpv6, cmdIP6TablesRestore},
}
for _, testCase := range testCases {
var cmd string
switch testCase.funcName {
case "iptablesCommand":
cmd = iptablesCommand(testCase.protocol)
case "iptablesSaveCommand":
cmd = iptablesSaveCommand(testCase.protocol)
case "iptablesRestoreCommand":
cmd = iptablesRestoreCommand(testCase.protocol)
}
if cmd != testCase.expectedCmd {
t.Errorf("Function: %s, Expected result: %s, Actual result: %s", testCase.funcName, testCase.expectedCmd, cmd)
}
}
}
func TestCheckRuleWithoutCheckPresent(t *testing.T) { func TestCheckRuleWithoutCheckPresent(t *testing.T) {
iptables_save_output := `# Generated by iptables-save v1.4.7 on Wed Oct 29 14:56:01 2014 iptablesSaveOutput := `# Generated by iptables-save v1.4.7 on Wed Oct 29 14:56:01 2014
*nat *nat
:PREROUTING ACCEPT [2136997:197881818] :PREROUTING ACCEPT [2136997:197881818]
:POSTROUTING ACCEPT [4284525:258542680] :POSTROUTING ACCEPT [4284525:258542680]
@ -526,7 +610,7 @@ COMMIT
fcmd := fakeexec.FakeCmd{ fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{ CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{
// Success. // Success.
func() ([]byte, error) { return []byte(iptables_save_output), nil }, func() ([]byte, error) { return []byte(iptablesSaveOutput), nil },
}, },
} }
fexec := fakeexec.FakeExec{ fexec := fakeexec.FakeExec{
@ -557,7 +641,7 @@ COMMIT
} }
func TestCheckRuleWithoutCheckAbsent(t *testing.T) { func TestCheckRuleWithoutCheckAbsent(t *testing.T) {
iptables_save_output := `# Generated by iptables-save v1.4.7 on Wed Oct 29 14:56:01 2014 iptablesSaveOutput := `# Generated by iptables-save v1.4.7 on Wed Oct 29 14:56:01 2014
*nat *nat
:PREROUTING ACCEPT [2136997:197881818] :PREROUTING ACCEPT [2136997:197881818]
:POSTROUTING ACCEPT [4284525:258542680] :POSTROUTING ACCEPT [4284525:258542680]
@ -569,7 +653,7 @@ COMMIT
fcmd := fakeexec.FakeCmd{ fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{ CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{
// Success. // Success.
func() ([]byte, error) { return []byte(iptables_save_output), nil }, func() ([]byte, error) { return []byte(iptablesSaveOutput), nil },
}, },
} }
fexec := fakeexec.FakeExec{ fexec := fakeexec.FakeExec{
@ -835,21 +919,27 @@ func TestReload(t *testing.T) {
} }
} }
func TestSaveInto(t *testing.T) { func testSaveInto(t *testing.T, protocol Protocol) {
output := `# Generated by iptables-save v1.6.0 on Thu Jan 19 11:38:09 2017 version := " v1.9.22"
iptablesCmd := iptablesCommand(protocol)
iptablesSaveCmd := iptablesSaveCommand(protocol)
iptablesRestoreCmd := iptablesRestoreCommand(protocol)
protoStr := protocolStr(protocol)
output := fmt.Sprintf(`# Generated by %s on Thu Jan 19 11:38:09 2017
*filter *filter
:INPUT ACCEPT [15079:38410730] :INPUT ACCEPT [15079:38410730]
:FORWARD ACCEPT [0:0] :FORWARD ACCEPT [0:0]
:OUTPUT ACCEPT [11045:521562] :OUTPUT ACCEPT [11045:521562]
COMMIT COMMIT
# Completed on Thu Jan 19 11:38:09 2017` # Completed on Thu Jan 19 11:38:09 2017`, iptablesSaveCmd+version)
fcmd := fakeexec.FakeCmd{ fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{ CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{
// iptables version check // iptables version check
func() ([]byte, error) { return []byte("iptables v1.9.22"), nil }, func() ([]byte, error) { return []byte(iptablesCmd + version), nil },
// iptables-restore version check // iptables-restore version check
func() ([]byte, error) { return []byte("iptables-restore v1.9.22"), nil }, func() ([]byte, error) { return []byte(iptablesRestoreCmd + version), nil },
}, },
RunScript: []fakeexec.FakeRunAction{ RunScript: []fakeexec.FakeRunAction{
func() ([]byte, []byte, error) { return []byte(output), nil, nil }, func() ([]byte, []byte, error) { return []byte(output), nil, nil },
@ -864,45 +954,58 @@ COMMIT
func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) }, func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
}, },
} }
runner := New(&fexec, dbus.NewFake(nil, nil), ProtocolIpv4) runner := New(&fexec, dbus.NewFake(nil, nil), protocol)
defer runner.Destroy() defer runner.Destroy()
buffer := bytes.NewBuffer(nil) buffer := bytes.NewBuffer(nil)
// Success. // Success.
err := runner.SaveInto(TableNAT, buffer) err := runner.SaveInto(TableNAT, buffer)
if err != nil { if err != nil {
t.Fatalf("expected success, got %v", err) t.Fatalf("%s: Expected success, got %v", protoStr, err)
} }
if string(buffer.Bytes()[:len(output)]) != output { if string(buffer.Bytes()[:len(output)]) != output {
t.Errorf("expected output to be equal to mocked one, got %v", buffer.Bytes()) t.Errorf("%s: Expected output '%s', got '%v'", protoStr, output, buffer.Bytes())
} }
if fcmd.CombinedOutputCalls != 2 { if fcmd.CombinedOutputCalls != 2 {
t.Errorf("expected 2 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) t.Errorf("%s: Expected 2 CombinedOutput() calls, got %d", protoStr, fcmd.CombinedOutputCalls)
} }
if fcmd.RunCalls != 1 { if fcmd.RunCalls != 1 {
t.Errorf("expected 1 Run() call, got %d", fcmd.RunCalls) t.Errorf("%s: Expected 1 Run() call, got %d", protoStr, fcmd.RunCalls)
} }
if !sets.NewString(fcmd.RunLog[0]...).HasAll("iptables-save", "-t", "nat") { if !sets.NewString(fcmd.RunLog[0]...).HasAll(iptablesSaveCmd, "-t", "nat") {
t.Errorf("wrong Run() log, got %s", fcmd.RunLog[0]) t.Errorf("%s: Expected cmd containing '%s -t nat', got '%s'", protoStr, iptablesSaveCmd, fcmd.RunLog[0])
} }
// Failure. // Failure.
buffer.Reset() buffer.Reset()
err = runner.SaveInto(TableNAT, buffer) err = runner.SaveInto(TableNAT, buffer)
if err == nil { if err == nil {
t.Errorf("expected failure") t.Errorf("%s: Expected failure", protoStr)
} }
} }
func TestRestore(t *testing.T) { func TestSaveIntoIPv4(t *testing.T) {
testSaveInto(t, ProtocolIpv4)
}
func TestSaveIntoIPv6(t *testing.T) {
testSaveInto(t, ProtocolIpv6)
}
func testRestore(t *testing.T, protocol Protocol) {
version := " v1.9.22"
iptablesCmd := iptablesCommand(protocol)
iptablesRestoreCmd := iptablesRestoreCommand(protocol)
protoStr := protocolStr(protocol)
fcmd := fakeexec.FakeCmd{ fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{ CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{
// iptables version check // iptables version check
func() ([]byte, error) { return []byte("iptables v1.9.22"), nil }, func() ([]byte, error) { return []byte(iptablesCmd + version), nil },
// iptables-restore version check // iptables-restore version check
func() ([]byte, error) { return []byte("iptables-restore v1.9.22"), nil }, func() ([]byte, error) { return []byte(iptablesRestoreCmd + version), nil },
func() ([]byte, error) { return []byte{}, nil }, func() ([]byte, error) { return []byte{}, nil },
func() ([]byte, error) { return []byte{}, nil }, func() ([]byte, error) { return []byte{}, nil },
func() ([]byte, error) { return []byte{}, nil }, func() ([]byte, error) { return []byte{}, nil },
@ -921,64 +1024,72 @@ func TestRestore(t *testing.T) {
func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) }, func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
}, },
} }
runner := New(&fexec, dbus.NewFake(nil, nil), ProtocolIpv4) runner := New(&fexec, dbus.NewFake(nil, nil), protocol)
defer runner.Destroy() defer runner.Destroy()
// both flags true // both flags true
err := runner.Restore(TableNAT, []byte{}, FlushTables, RestoreCounters) err := runner.Restore(TableNAT, []byte{}, FlushTables, RestoreCounters)
if err != nil { if err != nil {
t.Errorf("expected success, got %v", err) t.Errorf("%s flush,restore: Expected success, got %v", protoStr, err)
} }
commandSet := sets.NewString(fcmd.CombinedOutputLog[2]...) commandSet := sets.NewString(fcmd.CombinedOutputLog[2]...)
if !commandSet.HasAll("iptables-restore", "-T", string(TableNAT), "--counters") || commandSet.HasAny("--noflush") { if !commandSet.HasAll(iptablesRestoreCmd, "-T", string(TableNAT), "--counters") || commandSet.HasAny("--noflush") {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[1]) t.Errorf("%s flush, restore: Expected cmd containing '%s -T %s --counters', got '%s'", protoStr, iptablesRestoreCmd, string(TableNAT), fcmd.CombinedOutputLog[2])
} }
// FlushTables, NoRestoreCounters // FlushTables, NoRestoreCounters
err = runner.Restore(TableNAT, []byte{}, FlushTables, NoRestoreCounters) err = runner.Restore(TableNAT, []byte{}, FlushTables, NoRestoreCounters)
if err != nil { if err != nil {
t.Errorf("expected success, got %v", err) t.Errorf("%s flush, no restore: Expected success, got %v", protoStr, err)
} }
commandSet = sets.NewString(fcmd.CombinedOutputLog[3]...) commandSet = sets.NewString(fcmd.CombinedOutputLog[3]...)
if !commandSet.HasAll("iptables-restore", "-T", string(TableNAT)) || commandSet.HasAny("--noflush", "--counters") { if !commandSet.HasAll(iptablesRestoreCmd, "-T", string(TableNAT)) || commandSet.HasAny("--noflush", "--counters") {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2]) t.Errorf("%s flush, no restore: Expected cmd containing '--noflush' or '--counters', got '%s'", protoStr, fcmd.CombinedOutputLog[3])
} }
// NoFlushTables, RestoreCounters // NoFlushTables, RestoreCounters
err = runner.Restore(TableNAT, []byte{}, NoFlushTables, RestoreCounters) err = runner.Restore(TableNAT, []byte{}, NoFlushTables, RestoreCounters)
if err != nil { if err != nil {
t.Errorf("expected success, got %v", err) t.Errorf("%s no flush, restore: Expected success, got %v", protoStr, err)
} }
commandSet = sets.NewString(fcmd.CombinedOutputLog[4]...) commandSet = sets.NewString(fcmd.CombinedOutputLog[4]...)
if !commandSet.HasAll("iptables-restore", "-T", string(TableNAT), "--noflush", "--counters") { if !commandSet.HasAll(iptablesRestoreCmd, "-T", string(TableNAT), "--noflush", "--counters") {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[3]) t.Errorf("%s no flush, restore: Expected cmd containing '--noflush' and '--counters', got '%s'", protoStr, fcmd.CombinedOutputLog[4])
} }
// NoFlushTables, NoRestoreCounters // NoFlushTables, NoRestoreCounters
err = runner.Restore(TableNAT, []byte{}, NoFlushTables, NoRestoreCounters) err = runner.Restore(TableNAT, []byte{}, NoFlushTables, NoRestoreCounters)
if err != nil { if err != nil {
t.Errorf("expected success, got %v", err) t.Errorf("%s no flush, no restore: Expected success, got %v", protoStr, err)
} }
commandSet = sets.NewString(fcmd.CombinedOutputLog[5]...) commandSet = sets.NewString(fcmd.CombinedOutputLog[5]...)
if !commandSet.HasAll("iptables-restore", "-T", string(TableNAT), "--noflush") || commandSet.HasAny("--counters") { if !commandSet.HasAll(iptablesRestoreCmd, "-T", string(TableNAT), "--noflush") || commandSet.HasAny("--counters") {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[4]) t.Errorf("%s no flush, no restore: Expected cmd containing '%s -T %s --noflush', got '%s'", protoStr, iptablesRestoreCmd, string(TableNAT), fcmd.CombinedOutputLog[5])
} }
if fcmd.CombinedOutputCalls != 6 { if fcmd.CombinedOutputCalls != 6 {
t.Errorf("expected 6 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) t.Errorf("%s: Expected 6 total CombinedOutput() calls, got %d", protoStr, fcmd.CombinedOutputCalls)
} }
// Failure. // Failure.
err = runner.Restore(TableNAT, []byte{}, FlushTables, RestoreCounters) err = runner.Restore(TableNAT, []byte{}, FlushTables, RestoreCounters)
if err == nil { if err == nil {
t.Errorf("expected failure") t.Errorf("%s Expected a failure", protoStr)
} }
} }
func TestRestoreIPv4(t *testing.T) {
testRestore(t, ProtocolIpv4)
}
func TestRestoreIPv6(t *testing.T) {
testRestore(t, ProtocolIpv6)
}
// TestRestoreAll tests only the simplest use case, as flag handling code is already tested in TestRestore // TestRestoreAll tests only the simplest use case, as flag handling code is already tested in TestRestore
func TestRestoreAll(t *testing.T) { func TestRestoreAll(t *testing.T) {
fcmd := fakeexec.FakeCmd{ fcmd := fakeexec.FakeCmd{