Skip to content
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

Jump to bottom

controller: Check if IPTables is enabled for arrangeUserFilterRule #2339

Merged
merged 2 commits into from
Jun 21, 2019
Merged

controller: Check if IPTables is enabled for arrangeUserFilterRule #2339

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e34060
controller: Check if IPTables is enabled for arrangeUserFilterRule
phyber Feb 20, 2019
a232658
Move hasIPTablesEnabled check into firewall_linux.go
phyber Apr 29, 2019
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
34 changes: 32 additions & 2 deletions firewall_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,52 @@ package libnetwork

import (
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/netlabel"
"github.com/sirupsen/logrus"
)

const userChain = "DOCKER-USER"

func (c *controller) arrangeUserFilterRule() {
c.Lock()
arrangeUserFilterRule()

if c.hasIPTablesEnabled() {
arrangeUserFilterRule()
}

c.Unlock()

iptables.OnReloaded(func() {
c.Lock()
arrangeUserFilterRule()

if c.hasIPTablesEnabled() {
arrangeUserFilterRule()
}

c.Unlock()
})
}

func (c *controller) hasIPTablesEnabled() bool {
// Locking c should be handled in the calling method.
if c.cfg == nil || c.cfg.Daemon.DriverCfg[netlabel.GenericData] == nil {
return false
}

genericData, ok := c.cfg.Daemon.DriverCfg[netlabel.GenericData]
if !ok {
return false
}

optMap := genericData.(map[string]interface{})
enabled, ok := optMap["EnableIPTables"].(bool)
if !ok {
return false
}

return enabled
}

// This chain allow users to configure firewall policies in a way that persists
// docker operations/restarts. Docker will not delete or modify any pre-existing
// rules from the DOCKER-USER filter chain.
Expand Down