dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-06-30 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52821 from notandruu/daemon/rlkclient-loopback-simplify

Browse Source 
libnet/rlkclient: simplify ChildHostIP loopback handling
This commit is contained in:
Sebastiaan van Stijn
2026-06-12 17:03:16 +02:00
committed by GitHub
parent bf81e1d54e 4e04377caa
commit 5ceb949240
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
daemon/libnetwork/internal/rlkclient/rootlesskit_client_linux.go
View File

@@ -110,11 +110,12 @@ func (c *PortDriverClient) ChildHostIP(proto string, hostIP netip.Addr) netip.Ad
if c.childIP.IsValid() {
return c.childIP
}
// Preserve IPv4 loopback addresses, the child namespace's lo covers all
// of 127.0.0.0/8. Mapping them all to 127.0.0.1 makes bindings on the
// same port but distinct loopback addresses collide in the child
// namespace.
if hostIP.Is4() && hostIP.IsLoopback() {
// Child namespaces only listen on loopback addresses. Preserve requested
// loopback addresses (the child namespace's lo covers all of 127.0.0.0/8,
// and collapsing them makes bindings on the same port but distinct
// loopback addresses collide); otherwise use the canonical loopback
// address for the family.
if hostIP.IsLoopback() {
return hostIP
}
if hostIP.Is6() {

7
daemon/libnetwork/internal/rlkclient/rootlesskit_client_linux_test.go
View File

@@ -77,6 +77,13 @@ func TestChildHostIP(t *testing.T) {
hostIP: netip.MustParseAddr("127.0.1.2"),
want: netip.MustParseAddr("127.0.1.2"),
},
{
name: "v6 loopback",
pdc: builtin,
proto: "tcp",
hostIP: netip.MustParseAddr("::1"),
want: netip.IPv6Loopback(),
},
{
name: "v6 non-loopback",
pdc: builtin,