mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
2cc5bd33ee
Implement the proposal from https://github.com/docker/docker/issues/24430#issuecomment-233100121 Removes acceptance policy and secret in favor of an automatically generated join token that combines the secret, CA hash, and manager/worker role into a single opaque string. Adds a docker swarm join-token subcommand to inspect and rotate the tokens. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
176 lines
4.6 KiB
Go
176 lines
4.6 KiB
Go
package swarm
|
|
|
|
import (
|
|
"encoding/csv"
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/docker/opts"
|
|
"github.com/docker/engine-api/types/swarm"
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
const (
|
|
defaultListenAddr = "0.0.0.0:2377"
|
|
|
|
flagCertExpiry = "cert-expiry"
|
|
flagDispatcherHeartbeat = "dispatcher-heartbeat"
|
|
flagListenAddr = "listen-addr"
|
|
flagToken = "token"
|
|
flagTaskHistoryLimit = "task-history-limit"
|
|
flagExternalCA = "external-ca"
|
|
)
|
|
|
|
type swarmOptions struct {
|
|
taskHistoryLimit int64
|
|
dispatcherHeartbeat time.Duration
|
|
nodeCertExpiry time.Duration
|
|
externalCA ExternalCAOption
|
|
}
|
|
|
|
// NodeAddrOption is a pflag.Value for listen and remote addresses
|
|
type NodeAddrOption struct {
|
|
addr string
|
|
}
|
|
|
|
// String prints the representation of this flag
|
|
func (a *NodeAddrOption) String() string {
|
|
return a.Value()
|
|
}
|
|
|
|
// Set the value for this flag
|
|
func (a *NodeAddrOption) Set(value string) error {
|
|
addr, err := opts.ParseTCPAddr(value, a.addr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
a.addr = addr
|
|
return nil
|
|
}
|
|
|
|
// Type returns the type of this flag
|
|
func (a *NodeAddrOption) Type() string {
|
|
return "node-addr"
|
|
}
|
|
|
|
// Value returns the value of this option as addr:port
|
|
func (a *NodeAddrOption) Value() string {
|
|
return strings.TrimPrefix(a.addr, "tcp://")
|
|
}
|
|
|
|
// NewNodeAddrOption returns a new node address option
|
|
func NewNodeAddrOption(addr string) NodeAddrOption {
|
|
return NodeAddrOption{addr}
|
|
}
|
|
|
|
// NewListenAddrOption returns a NodeAddrOption with default values
|
|
func NewListenAddrOption() NodeAddrOption {
|
|
return NewNodeAddrOption(defaultListenAddr)
|
|
}
|
|
|
|
// ExternalCAOption is a Value type for parsing external CA specifications.
|
|
type ExternalCAOption struct {
|
|
values []*swarm.ExternalCA
|
|
}
|
|
|
|
// Set parses an external CA option.
|
|
func (m *ExternalCAOption) Set(value string) error {
|
|
parsed, err := parseExternalCA(value)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
m.values = append(m.values, parsed)
|
|
return nil
|
|
}
|
|
|
|
// Type returns the type of this option.
|
|
func (m *ExternalCAOption) Type() string {
|
|
return "external-ca"
|
|
}
|
|
|
|
// String returns a string repr of this option.
|
|
func (m *ExternalCAOption) String() string {
|
|
externalCAs := []string{}
|
|
for _, externalCA := range m.values {
|
|
repr := fmt.Sprintf("%s: %s", externalCA.Protocol, externalCA.URL)
|
|
externalCAs = append(externalCAs, repr)
|
|
}
|
|
return strings.Join(externalCAs, ", ")
|
|
}
|
|
|
|
// Value returns the external CAs
|
|
func (m *ExternalCAOption) Value() []*swarm.ExternalCA {
|
|
return m.values
|
|
}
|
|
|
|
// parseExternalCA parses an external CA specification from the command line,
|
|
// such as protocol=cfssl,url=https://example.com.
|
|
func parseExternalCA(caSpec string) (*swarm.ExternalCA, error) {
|
|
csvReader := csv.NewReader(strings.NewReader(caSpec))
|
|
fields, err := csvReader.Read()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
externalCA := swarm.ExternalCA{
|
|
Options: make(map[string]string),
|
|
}
|
|
|
|
var (
|
|
hasProtocol bool
|
|
hasURL bool
|
|
)
|
|
|
|
for _, field := range fields {
|
|
parts := strings.SplitN(field, "=", 2)
|
|
|
|
if len(parts) != 2 {
|
|
return nil, fmt.Errorf("invalid field '%s' must be a key=value pair", field)
|
|
}
|
|
|
|
key, value := parts[0], parts[1]
|
|
|
|
switch strings.ToLower(key) {
|
|
case "protocol":
|
|
hasProtocol = true
|
|
if strings.ToLower(value) == string(swarm.ExternalCAProtocolCFSSL) {
|
|
externalCA.Protocol = swarm.ExternalCAProtocolCFSSL
|
|
} else {
|
|
return nil, fmt.Errorf("unrecognized external CA protocol %s", value)
|
|
}
|
|
case "url":
|
|
hasURL = true
|
|
externalCA.URL = value
|
|
default:
|
|
externalCA.Options[key] = value
|
|
}
|
|
}
|
|
|
|
if !hasProtocol {
|
|
return nil, errors.New("the external-ca option needs a protocol= parameter")
|
|
}
|
|
if !hasURL {
|
|
return nil, errors.New("the external-ca option needs a url= parameter")
|
|
}
|
|
|
|
return &externalCA, nil
|
|
}
|
|
|
|
func addSwarmFlags(flags *pflag.FlagSet, opts *swarmOptions) {
|
|
flags.Int64Var(&opts.taskHistoryLimit, flagTaskHistoryLimit, 10, "Task history retention limit")
|
|
flags.DurationVar(&opts.dispatcherHeartbeat, flagDispatcherHeartbeat, time.Duration(5*time.Second), "Dispatcher heartbeat period")
|
|
flags.DurationVar(&opts.nodeCertExpiry, flagCertExpiry, time.Duration(90*24*time.Hour), "Validity period for node certificates")
|
|
flags.Var(&opts.externalCA, flagExternalCA, "Specifications of one or more certificate signing endpoints")
|
|
}
|
|
|
|
func (opts *swarmOptions) ToSpec() swarm.Spec {
|
|
spec := swarm.Spec{}
|
|
spec.Orchestration.TaskHistoryRetentionLimit = opts.taskHistoryLimit
|
|
spec.Dispatcher.HeartbeatPeriod = uint64(opts.dispatcherHeartbeat.Nanoseconds())
|
|
spec.CAConfig.NodeCertExpiry = opts.nodeCertExpiry
|
|
spec.CAConfig.ExternalCAs = opts.externalCA.Value()
|
|
return spec
|
|
}
|