kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix duplicated iptables rules

Browse source 
The `iptables.Exists` function is wrong in two ways:
1. The iptables -C call doesn't add `-j DOCKER` and fails to match
2. The long path takes ordering into account in comparison and fails to match

This patch fixes issue 1 by including `-j DOCKER` in the check.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
This commit is contained in:
Arnaud Porterie 2015-06-15 23:55:29 -07:00
parent e228afce04
commit 9e7d2fe74e
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libnetwork/iptables/iptables.go
View file

@ -99,7 +99,8 @@ func NewChain(name, bridge string, table Table, hairpinMode bool) (*Chain, error
case Nat: case Nat:
preroute := []string{ preroute := []string{
"-m", "addrtype", "-m", "addrtype",
"--dst-type", "LOCAL"} "--dst-type", "LOCAL",
"-j", c.Name}
if !Exists(Nat, "PREROUTING", preroute...) { if !Exists(Nat, "PREROUTING", preroute...) {
if err := c.Prerouting(Append, preroute...); err != nil { if err := c.Prerouting(Append, preroute...); err != nil {
return nil, fmt.Errorf("Failed to inject docker in PREROUTING chain: %s", err) return nil, fmt.Errorf("Failed to inject docker in PREROUTING chain: %s", err)
@ -107,7 +108,8 @@ func NewChain(name, bridge string, table Table, hairpinMode bool) (*Chain, error
} }
output := []string{ output := []string{
"-m", "addrtype", "-m", "addrtype",
"--dst-type", "LOCAL"} "--dst-type", "LOCAL",
"-j", c.Name}
if !hairpinMode { if !hairpinMode {
output = append(output, "!", "--dst", "127.0.0.0/8") output = append(output, "!", "--dst", "127.0.0.0/8")
} }
@ -228,7 +230,7 @@ func (c *Chain) Prerouting(action Action, args ...string) error {
if len(args) > 0 { if len(args) > 0 {
a = append(a, args...) a = append(a, args...)
} }
if output, err := Raw(append(a, "-j", c.Name)...); err != nil { if output, err := Raw(a...); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return ChainError{Chain: "PREROUTING", Output: output} return ChainError{Chain: "PREROUTING", Output: output}
@ -242,7 +244,7 @@ func (c *Chain) Output(action Action, args ...string) error {
if len(args) > 0 { if len(args) > 0 {
a = append(a, args...) a = append(a, args...)
} }
if output, err := Raw(append(a, "-j", c.Name)...); err != nil { if output, err := Raw(a...); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return ChainError{Chain: "OUTPUT", Output: output} return ChainError{Chain: "OUTPUT", Output: output}
@ -254,9 +256,9 @@ func (c *Chain) Output(action Action, args ...string) error {
func (c *Chain) Remove() error { func (c *Chain) Remove() error {
// Ignore errors - This could mean the chains were never set up // Ignore errors - This could mean the chains were never set up
if c.Table == Nat { if c.Table == Nat {
c.Prerouting(Delete, "-m", "addrtype", "--dst-type", "LOCAL") c.Prerouting(Delete, "-m", "addrtype", "--dst-type", "LOCAL", "-j", c.Name)
c.Output(Delete, "-m", "addrtype", "--dst-type", "LOCAL", "!", "--dst", "127.0.0.0/8") c.Output(Delete, "-m", "addrtype", "--dst-type", "LOCAL", "!", "--dst", "127.0.0.0/8", "-j", c.Name)
c.Output(Delete, "-m", "addrtype", "--dst-type", "LOCAL") // Created in versions <= 0.1.6 c.Output(Delete, "-m", "addrtype", "--dst-type", "LOCAL", "-j", c.Name) // Created in versions <= 0.1.6
c.Prerouting(Delete) c.Prerouting(Delete)
c.Output(Delete) c.Output(Delete)