Repository: moby/moby
File: libnetwork/drivers/bridge/internal/iptabler/cleaner.go (Go)

Code before:

func (ic iptablesCleaner) DelEndpoint(ctx context.Context, nc firewaller.NetworkConfig, epIPv4, epIPv6 netip.Addr) {
	n := network{
		config: nc,
		ipt:    &iptabler{config: ic.config},
	}
	if n.ipt.config.IPv4 && epIPv4.IsValid() {
		_ = n.filterDirectAccess(ctx, iptables.IPv4, n.config.Config4, epIPv4, false)
	}
	if n.ipt.config.IPv6 && epIPv6.IsValid() {
		_ = n.filterDirectAccess(ctx, iptables.IPv6, n.config.Config6, epIPv6, false)
	}
}

func (ic iptablesCleaner) DelPorts(ctx context.Context, nc firewaller.NetworkConfig, pbs []types.PortBinding) {
	n := network{
		config: nc,
		ipt:    &iptabler{config: ic.config},
	}
	_ = n.DelPorts(ctx, pbs)
}

func (ic iptablesCleaner) DelLink(ctx context.Context, nc firewaller.NetworkConfig, parentIP, childIP netip.Addr, ports []types.TransportPort) {
	// Nothing to do, legacy link rules are all in user-defined chains that have
	// already been deleted.
}


Review comment (suggestion):
`iptablesCleaner` is the only implementer of `DelLink`. It's a no-op, so better remove it from the `FirewallCleaner` interface.

Code after:
//go:build linux

package iptabler

import (
	"context"
	"net/netip"

	"github.com/containerd/log"
	"github.com/docker/docker/libnetwork/drivers/bridge/internal/firewaller"
	"github.com/docker/docker/libnetwork/iptables"
	"github.com/docker/docker/libnetwork/types"
)

type iptablesCleaner struct {
	config firewaller.Config
}

// NewCleaner checks for iptables rules left behind by an old daemon that was using
// the iptabler.
//
// If there are old rules present, it deletes as much as possible straight away
// (user-defined chains and jumps from the built-in chains).
//
// But, it can't delete network or port-specific rules from built-in chains
// without flushing those chains which would be very antisocial - because, at
// this stage, interface names, addresses, etc. are unknown. So, also return
// FirewallCleaner that the new Firewaller can use to delete those rules while
// it's setting up those networks/ports (probably on replay from persistent
// storage).
//
// If there are no old rules to clean up, return nil.
func NewCleaner(ctx context.Context, config firewaller.Config) firewaller.FirewallCleaner {
	clean := func(ipv iptables.IPVersion, enabled bool) bool {
		if !enabled {
			return false
		}
		t := iptables.GetIptable(ipv)
		// Since 28.0, the jump in the filter-FORWARD chain is DOCKER-FORWARD.
		// In earlier releases, there was a jump to DOCKER-ISOLATION-STAGE-1.
		if !t.Exists("filter", "FORWARD", "-j", DockerForwardChain) &&
			!t.Exists("filter", "FORWARD", "-j", isolationChain1) {
			return false
		}
		log.G(ctx).WithField("ipv", ipv).Info("Cleaning iptables")
		_ = t.DeleteJumpRule("FORWARD", DockerForwardChain)
		_ = deleteLegacyTopLevelRules(ctx, t, ipv)
		removeIPChains(ctx, ipv)
		return true
	}
	cleaned4 := clean(iptables.IPv4, config.IPv4)
	cleaned6 := clean(iptables.IPv6, config.IPv6)
	if !cleaned4 && !cleaned6 {
		return nil
	}
	return &iptablesCleaner{config: config}
}

func (ic iptablesCleaner) DelNetwork(ctx context.Context, nc firewaller.NetworkConfig) {
	if nc.Internal {
		return
	}
	n := network{
		config: nc,
		ipt:    &iptabler{config: ic.config},
	}
	if ic.config.IPv4 && nc.Config4.Prefix.IsValid() {
		_ = deleteLegacyFilterRules(iptables.IPv4, nc.IfName)
		_ = n.setupNonInternalNetworkRules(ctx, iptables.IPv4, nc.Config4, false)
	}
	if ic.config.IPv6 && nc.Config6.Prefix.IsValid() {
		_ = deleteLegacyFilterRules(iptables.IPv6, nc.IfName)
		_ = n.setupNonInternalNetworkRules(ctx, iptables.IPv6, nc.Config6, false)
	}
}

func (ic iptablesCleaner) DelEndpoint(ctx context.Context, nc firewaller.NetworkConfig, epIPv4, epIPv6 netip.Addr) {
	n := network{
		config: nc,
		ipt:    &iptabler{config: ic.config},
	}
	if n.ipt.config.IPv4 && epIPv4.IsValid() {
		_ = n.filterDirectAccess(ctx, iptables.IPv4, n.config.Config4, epIPv4, false)
	}
	if n.ipt.config.IPv6 && epIPv6.IsValid() {
		_ = n.filterDirectAccess(ctx, iptables.IPv6, n.config.Config6, epIPv6, false)
	}
}

func (ic iptablesCleaner) DelPorts(ctx context.Context, nc firewaller.NetworkConfig, pbs []types.PortBinding) {
	n := network{
		config: nc,
		ipt:    &iptabler{config: ic.config},
	}
	_ = n.DelPorts(ctx, pbs)
}