mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
a00d12a8dd
The current behavior of `docker swarm init` is to set up a swarm that
has no secret for joining, and does not require manual acceptance for
workers. Since workers may sometimes receive sensitive data such as pull
credentials, it makes sense to harden the defaults.
This change makes `docker swarm init` generate a random secret if none
is provided, and print it to the terminal. This secret will be needed to
join workers or managers to the swarm. In addition to improving access
control to the cluster, this setup removes an avenue for
denial-of-service attacks, since the secret is necessary to even create
an entry in the node list.
`docker swarm init --secret ""` will set up a swarm without a secret,
matching the old behavior. `docker swarm update --secret ""` removes the
automatically generated secret after `docker swarm init`.
Closes #23785
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 7342e42fce
)
Signed-off-by: Tibor Vass <tibor@docker.com>
171 lines
5.8 KiB
Go
171 lines
5.8 KiB
Go
// +build !windows
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io/ioutil"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/docker/pkg/integration/checker"
|
|
"github.com/docker/engine-api/types/swarm"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSwarmSuite) TestSwarmUpdate(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
|
|
getSpec := func() swarm.Spec {
|
|
out, err := d.Cmd("swarm", "inspect")
|
|
c.Assert(err, checker.IsNil)
|
|
var sw []swarm.Swarm
|
|
c.Assert(json.Unmarshal([]byte(out), &sw), checker.IsNil)
|
|
c.Assert(len(sw), checker.Equals, 1)
|
|
return sw[0].Spec
|
|
}
|
|
|
|
out, err := d.Cmd("swarm", "update", "--cert-expiry", "30h", "--dispatcher-heartbeat", "11s", "--auto-accept", "manager", "--auto-accept", "worker", "--secret", "foo")
|
|
c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
|
|
|
|
spec := getSpec()
|
|
c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 30*time.Hour)
|
|
c.Assert(spec.Dispatcher.HeartbeatPeriod, checker.Equals, uint64(11*time.Second))
|
|
|
|
c.Assert(spec.AcceptancePolicy.Policies, checker.HasLen, 2)
|
|
|
|
for _, p := range spec.AcceptancePolicy.Policies {
|
|
c.Assert(p.Autoaccept, checker.Equals, true)
|
|
c.Assert(p.Secret, checker.NotNil)
|
|
c.Assert(*p.Secret, checker.Not(checker.Equals), "")
|
|
}
|
|
|
|
out, err = d.Cmd("swarm", "update", "--auto-accept", "none")
|
|
c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
|
|
|
|
spec = getSpec()
|
|
c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 30*time.Hour)
|
|
c.Assert(spec.Dispatcher.HeartbeatPeriod, checker.Equals, uint64(11*time.Second))
|
|
|
|
c.Assert(spec.AcceptancePolicy.Policies, checker.HasLen, 2)
|
|
|
|
for _, p := range spec.AcceptancePolicy.Policies {
|
|
c.Assert(p.Autoaccept, checker.Equals, false)
|
|
// secret is still set
|
|
c.Assert(p.Secret, checker.NotNil)
|
|
c.Assert(*p.Secret, checker.Not(checker.Equals), "")
|
|
}
|
|
|
|
out, err = d.Cmd("swarm", "update", "--auto-accept", "manager", "--secret", "")
|
|
c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
|
|
|
|
spec = getSpec()
|
|
|
|
c.Assert(spec.AcceptancePolicy.Policies, checker.HasLen, 2)
|
|
|
|
for _, p := range spec.AcceptancePolicy.Policies {
|
|
c.Assert(p.Autoaccept, checker.Equals, p.Role == swarm.NodeRoleManager)
|
|
// secret has been removed
|
|
c.Assert(p.Secret, checker.IsNil)
|
|
}
|
|
|
|
// setting anything under 30m for cert-expiry is not allowed
|
|
out, err = d.Cmd("swarm", "update", "--cert-expiry", "15m")
|
|
c.Assert(err, checker.NotNil)
|
|
c.Assert(out, checker.Contains, "minimum certificate expiry time")
|
|
spec = getSpec()
|
|
c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 30*time.Hour)
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestSwarmInit(c *check.C) {
|
|
d := s.AddDaemon(c, false, false)
|
|
|
|
getSpec := func() swarm.Spec {
|
|
out, err := d.Cmd("swarm", "inspect")
|
|
c.Assert(err, checker.IsNil)
|
|
var sw []swarm.Swarm
|
|
c.Assert(json.Unmarshal([]byte(out), &sw), checker.IsNil)
|
|
c.Assert(len(sw), checker.Equals, 1)
|
|
return sw[0].Spec
|
|
}
|
|
|
|
out, err := d.Cmd("swarm", "init", "--cert-expiry", "30h", "--dispatcher-heartbeat", "11s", "--auto-accept", "manager", "--auto-accept", "worker", "--secret", "foo")
|
|
c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
|
|
|
|
spec := getSpec()
|
|
c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 30*time.Hour)
|
|
c.Assert(spec.Dispatcher.HeartbeatPeriod, checker.Equals, uint64(11*time.Second))
|
|
|
|
c.Assert(spec.AcceptancePolicy.Policies, checker.HasLen, 2)
|
|
|
|
for _, p := range spec.AcceptancePolicy.Policies {
|
|
c.Assert(p.Autoaccept, checker.Equals, true)
|
|
c.Assert(p.Secret, checker.NotNil)
|
|
c.Assert(*p.Secret, checker.Not(checker.Equals), "")
|
|
}
|
|
|
|
c.Assert(d.Leave(true), checker.IsNil)
|
|
|
|
out, err = d.Cmd("swarm", "init", "--auto-accept", "none", "--secret", "")
|
|
c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
|
|
|
|
spec = getSpec()
|
|
c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 90*24*time.Hour)
|
|
c.Assert(spec.Dispatcher.HeartbeatPeriod, checker.Equals, uint64(5*time.Second))
|
|
|
|
c.Assert(spec.AcceptancePolicy.Policies, checker.HasLen, 2)
|
|
|
|
for _, p := range spec.AcceptancePolicy.Policies {
|
|
c.Assert(p.Autoaccept, checker.Equals, false)
|
|
c.Assert(p.Secret, checker.IsNil)
|
|
}
|
|
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestSwarmInitIPv6(c *check.C) {
|
|
testRequires(c, IPv6)
|
|
d1 := s.AddDaemon(c, false, false)
|
|
out, err := d1.Cmd("swarm", "init", "--listen-addr", "::1")
|
|
c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
|
|
|
|
d2 := s.AddDaemon(c, false, false)
|
|
out, err = d2.Cmd("swarm", "join", "::1")
|
|
c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
|
|
|
|
out, err = d2.Cmd("info")
|
|
c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
|
|
c.Assert(out, checker.Contains, "Swarm: active")
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestSwarmIncompatibleDaemon(c *check.C) {
|
|
// init swarm mode and stop a daemon
|
|
d := s.AddDaemon(c, true, true)
|
|
info, err := d.info()
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
|
|
c.Assert(d.Stop(), checker.IsNil)
|
|
|
|
// start a daemon with --cluster-store and --cluster-advertise
|
|
err = d.Start("--cluster-store=consul://consuladdr:consulport/some/path", "--cluster-advertise=1.1.1.1:2375")
|
|
c.Assert(err, checker.NotNil)
|
|
content, _ := ioutil.ReadFile(d.logFile.Name())
|
|
c.Assert(string(content), checker.Contains, "--cluster-store and --cluster-advertise daemon configurations are incompatible with swarm mode")
|
|
|
|
// start a daemon with --live-restore
|
|
err = d.Start("--live-restore")
|
|
c.Assert(err, checker.NotNil)
|
|
content, _ = ioutil.ReadFile(d.logFile.Name())
|
|
c.Assert(string(content), checker.Contains, "--live-restore daemon configuration is incompatible with swarm mode")
|
|
// restart for teardown
|
|
c.Assert(d.Start(), checker.IsNil)
|
|
}
|
|
|
|
// Test case for #24090
|
|
func (s *DockerSwarmSuite) TestSwarmNodeListHostname(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
|
|
// The first line should contain "HOSTNAME"
|
|
out, err := d.Cmd("node", "ls")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(strings.Split(out, "\n")[0], checker.Contains, "HOSTNAME")
|
|
}
|