InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/links: fix port-ranges with mixed protocols

Browse Source 
The code incorrectly created env-vars for consecutive port numbers with
a different protocol; we should only consider ports to be part of a range
if they have consecutive port-numbers and have the same protocol.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-01-09 11:32:24 +01:00
parent 251c68c647
commit fcdd6f4ad2
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/links/links.go
View File

@@ -126,7 +126,7 @@ func nextContiguous(ports []nat.Port, value int, index int) int {
return index
}
for i := index + 1; i < len(ports); i++ {
if ports[i].Int() > value+1 {
if ports[i].Int() > value+1 || !strings.EqualFold(ports[i].Proto(), ports[i-1].Proto()) {
return i - 1
}

13
daemon/links/links_test.go
View File

@@ -91,15 +91,23 @@ func TestSortPorts(t *testing.T) {
func TestLinkMultipleEnv(t *testing.T) {
actual := EnvVars("172.0.17.3", "172.0.17.2", "/db/docker", []string{"PASSWORD=gordon"}, nat.PortSet{
"6300/udp": struct{}{},
"6379/tcp": struct{}{},
"6380/tcp": struct{}{},
"6381/tcp": struct{}{},
"6382/udp": struct{}{},
})
expectedEnv := []string{
"DOCKER_ENV_PASSWORD=gordon",
"DOCKER_NAME=/db/docker",
"DOCKER_PORT=tcp://172.0.17.2:6379",
"DOCKER_PORT_6300_UDP=udp://172.0.17.2:6300",
"DOCKER_PORT_6300_UDP_ADDR=172.0.17.2",
"DOCKER_PORT_6300_UDP_PORT=6300",
"DOCKER_PORT_6300_UDP_PROTO=udp",
"DOCKER_PORT_6379_TCP=tcp://172.0.17.2:6379",
"DOCKER_PORT_6379_TCP_ADDR=172.0.17.2",
"DOCKER_PORT_6379_TCP_ADDR=172.0.17.2", // FIXME(thaJeztah): duplicate?
@@ -120,6 +128,11 @@ func TestLinkMultipleEnv(t *testing.T) {
"DOCKER_PORT_6381_TCP_ADDR=172.0.17.2",
"DOCKER_PORT_6381_TCP_PORT=6381",
"DOCKER_PORT_6381_TCP_PROTO=tcp",
"DOCKER_PORT_6382_UDP=udp://172.0.17.2:6382",
"DOCKER_PORT_6382_UDP_ADDR=172.0.17.2",
"DOCKER_PORT_6382_UDP_PORT=6382",
"DOCKER_PORT_6382_UDP_PROTO=udp",
}
sort.Strings(actual) // order of env-vars is not relevant