Skip to content

fix: Exists and Delete truncate -A <chain> from rulespec #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clarkwalcott wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −2
Open

fix: Exists and Delete truncate -A <chain> from rulespec #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions iptables/iptables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,12 @@ func (ipt *IPTables) Exists(table, chain string, rulespec ...string) (bool, erro
return ipt.existsForOldIptables(table, chain, rulespec)

}
cmd := append([]string{"-t", table, "-C", chain}, rulespec...)
spec := rulespec
// truncate "-A <CHAIN>" if present since -A collides with -C
if len(spec) > 1 && spec[0] == "-A" {
spec = spec[2:]
}
cmd := append([]string{"-t", table, "-C", chain}, spec...)
err := ipt.run(cmd...)
eerr, eok := err.(*Error)
switch {
Expand Down Expand Up @@ -255,7 +260,12 @@ func (ipt *IPTables) AppendUnique(table, chain string, rulespec ...string) error

// Delete removes rulespec in specified table/chain
func (ipt *IPTables) Delete(table, chain string, rulespec ...string) error {
cmd := append([]string{"-t", table, "-D", chain}, rulespec...)
spec := rulespec
// truncate "-A <CHAIN>" if present since -A collides with -D
if len(spec) > 1 && spec[0] == "-A" {
spec = spec[2:]
}
cmd := append([]string{"-t", table, "-D", chain}, spec...)
return ipt.run(cmd...)
}

Expand Down
16 changes: 16 additions & 0 deletions iptables/iptables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,22 @@ func runRulesTests(t *testing.T, ipt *IPTables) {
t.Fatalf("DeleteIfExists failed for non-existing rule: %v", err)
}

// Verify DeleteIfExists is compatible with rules returned from List
err = ipt.Append("filter", chain, "-s", address3, "-d", subnet2, "-j", "ACCEPT")
if err != nil {
t.Fatalf("Append failed: %v", err)
}

rules, err = ipt.List("filter", chain)
if err != nil {
t.Fatalf("List failed: %v", err)
}

err = ipt.DeleteIfExists("filter", chain, rules[0])
if err != nil {
t.Fatalf("Delete failed: %v", err)
}

// Clear the chain that was created.
err = ipt.ClearChain("filter", chain)
if err != nil {
Expand Down