beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork: arrangeUserFilterRule: don't return early

Browse source 
commit ffd75c2e0c updated this function to
set up the DOCKER-USER chain for both iptables and ip6tables, however the
function would return early if a failure happened (instead of continuing
with the next iptables version).

This patch extracts setting up the chain to a separate function, and updates
arrangeUserFilterRule to log the failure as a warning, but continue with
the next iptables version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-16 16:21:23 +02:00
parent a5f45b47a3
commit 9484520327
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libnetwork/firewall_linux.go
View file

@ -2,6 +2,7 @@ package libnetwork
import ( import (
"context" "context"
"fmt"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/docker/docker/libnetwork/iptables" "github.com/docker/docker/libnetwork/iptables"
@ -18,6 +19,18 @@ func setupArrangeUserFilterRule(c *Controller) {
// arrangeUserFilterRule sets up the DOCKER-USER chain for each iptables version // arrangeUserFilterRule sets up the DOCKER-USER chain for each iptables version
// (IPv4, IPv6) that's enabled in the controller's configuration. // (IPv4, IPv6) that's enabled in the controller's configuration.
func arrangeUserFilterRule() {
if ctrl == nil {
return
}
for _, ipVersion := range ctrl.enabledIptablesVersions() {
if err := setupUserChain(ipVersion); err != nil {
log.G(context.TODO()).WithError(err).Warn("arrangeUserFilterRule")
}
}
}
// setupUserChain sets up the DOCKER-USER chain for the given [iptables.IPVersion].
// //
// This chain allows users to configure firewall policies in a way that // This chain allows users to configure firewall policies in a way that
// persist daemon operations/restarts. The daemon does not delete or modify // persist daemon operations/restarts. The daemon does not delete or modify
@ -26,23 +39,16 @@ func setupArrangeUserFilterRule(c *Controller) {
// Once the DOCKER-USER chain is created, the daemon does not remove it when // Once the DOCKER-USER chain is created, the daemon does not remove it when
// IPTableForwarding is disabled, because it contains rules configured by user // IPTableForwarding is disabled, because it contains rules configured by user
// that are beyond the daemon's control. // that are beyond the daemon's control.
func arrangeUserFilterRule() { func setupUserChain(ipVersion iptables.IPVersion) error {
if ctrl == nil { ipt := iptables.GetIptable(ipVersion)
return if _, err := ipt.NewChain(userChain, iptables.Filter, false); err != nil {
return fmt.Errorf("failed to create %s %v chain: %v", userChain, ipVersion, err)
} }
if err := ipt.AddReturnRule(userChain); err != nil {
for _, ipVersion := range ctrl.enabledIptablesVersions() { return fmt.Errorf("failed to add the RETURN rule for %s %v: %w", userChain, ipVersion, err)
ipt := iptables.GetIptable(ipVersion)
if _, err := ipt.NewChain(userChain, iptables.Filter, false); err != nil {
log.G(context.TODO()).WithError(err).Warnf("Failed to create %s %v chain", userChain, ipVersion)
return
}
if err := ipt.AddReturnRule(userChain); err != nil {
log.G(context.TODO()).WithError(err).Warnf("Failed to add the RETURN rule for %s %v", userChain, ipVersion)
return
}
if err := ipt.EnsureJumpRule("FORWARD", userChain); err != nil {
log.G(context.TODO()).WithError(err).Warnf("Failed to ensure the jump rule for %s %v", userChain, ipVersion)
}
} }
if err := ipt.EnsureJumpRule("FORWARD", userChain); err != nil {
return fmt.Errorf("failed to ensure the jump rule for %s %v: %w", userChain, ipVersion, err)
}
return nil
} }

1
libnetwork/firewall_others.go
View file

@ -4,3 +4,4 @@ package libnetwork
func setupArrangeUserFilterRule(c *Controller) {} func setupArrangeUserFilterRule(c *Controller) {}
func arrangeUserFilterRule() {} func arrangeUserFilterRule() {}
func setupUserChain(ipVersion any) error { return nil }