docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2053 from allencloud/make-port-0-in-checkAddrFormat-invalid 

make port 0 invalid in checkAddrFormat
This commit is contained in:
Alexandre Beslic 2016-03-30 14:09:03 -07:00
parent d8bd5f9a53 e60b93aef3
commit 248cc597c0
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/join.go
View File

@ -18,7 +18,7 @@ func checkAddrFormat(addr string) bool {
return false return false
} }
portNum, err := strconv.Atoi(port) portNum, err := strconv.Atoi(port)
return err == nil && portNum >= 0 && portNum <= 65535 return err == nil && portNum > 0 && portNum <= 65535
} }
func join(c *cli.Context) { func join(c *cli.Context) {

1
cli/join_test.go
View File

@ -25,6 +25,7 @@ func TestCheckAddrFormat(t *testing.T) {
assert.True(t, checkAddrFormat("hostname:1111")) assert.True(t, checkAddrFormat("hostname:1111"))
assert.True(t, checkAddrFormat("host-name_42:1111")) assert.True(t, checkAddrFormat("host-name_42:1111"))
assert.False(t, checkAddrFormat("1.1.1.1:-1")) assert.False(t, checkAddrFormat("1.1.1.1:-1"))
assert.False(t, checkAddrFormat("1.1.1.1:0"))
assert.True(t, checkAddrFormat("1.1.1.1:65535")) assert.True(t, checkAddrFormat("1.1.1.1:65535"))
assert.False(t, checkAddrFormat("1.1.1.1:65536")) assert.False(t, checkAddrFormat("1.1.1.1:65536"))
assert.False(t, checkAddrFormat("1.1.1.1: 4000")) assert.False(t, checkAddrFormat("1.1.1.1: 4000"))

8
test/integration/cli_join.bats
View File

@ -15,6 +15,14 @@ DISCOVERY="consul://127.0.0.1:5555/test"
[ "$status" -ne 0 ] [ "$status" -ne 0 ]
[[ "${output}" == *"--advertise should be of the form ip:port or hostname:port"* ]] [[ "${output}" == *"--advertise should be of the form ip:port or hostname:port"* ]]
run swarm join --heartbeat=1s --ttl=10s --delay=1s --advertise=127.0.0.1:0 "$DISCOVERY"
[ "$status" -ne 0 ]
[[ "${output}" == *"--advertise should be of the form ip:port or hostname:port"* ]]
run swarm join --heartbeat=1s --ttl=10s --delay=1s --advertise=127.0.0.1:65536 "$DISCOVERY"
[ "$status" -ne 0 ]
[[ "${output}" == *"--advertise should be of the form ip:port or hostname:port"* ]]
# --delay # --delay
run swarm join --heartbeat=1s --ttl=10s --delay=asdf --advertise=127.0.0.1:2376 "$DISCOVERY" run swarm join --heartbeat=1s --ttl=10s --delay=asdf --advertise=127.0.0.1:2376 "$DISCOVERY"
[ "$status" -ne 0 ] [ "$status" -ne 0 ]