2019-12-06 20:46:46 +00:00
|
|
|
package nomad
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"fmt"
|
|
|
|
"strings"
|
2020-01-02 15:03:05 +00:00
|
|
|
"sync"
|
2019-12-06 20:46:46 +00:00
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/armon/go-metrics"
|
|
|
|
"github.com/hashicorp/consul/api"
|
|
|
|
"github.com/hashicorp/go-hclog"
|
|
|
|
"github.com/hashicorp/nomad/command/agent/consul"
|
2020-07-28 20:12:08 +00:00
|
|
|
"github.com/hashicorp/nomad/helper"
|
2019-12-06 20:46:46 +00:00
|
|
|
"github.com/hashicorp/nomad/nomad/structs"
|
|
|
|
"github.com/pkg/errors"
|
2020-01-02 15:03:05 +00:00
|
|
|
"golang.org/x/sync/errgroup"
|
2019-12-06 20:46:46 +00:00
|
|
|
"golang.org/x/time/rate"
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
// siTokenDescriptionFmt is the format for the .Description field of
|
|
|
|
// service identity tokens generated on behalf of Nomad.
|
|
|
|
siTokenDescriptionFmt = "_nomad_si [%s] [%s] [%s]"
|
|
|
|
|
|
|
|
// siTokenRequestRateLimit is the maximum number of requests per second Nomad
|
|
|
|
// will make against Consul for requesting SI tokens.
|
|
|
|
siTokenRequestRateLimit rate.Limit = 500
|
|
|
|
|
|
|
|
// siTokenMaxParallelRevokes is the maximum number of parallel SI token
|
|
|
|
// revocation requests Nomad will make against Consul.
|
|
|
|
siTokenMaxParallelRevokes = 64
|
|
|
|
|
2020-03-27 20:07:55 +00:00
|
|
|
// siTokenRevocationInterval is the interval at which SI tokens that failed
|
2020-01-02 15:03:05 +00:00
|
|
|
// initial revocation are retried.
|
2020-03-27 20:07:55 +00:00
|
|
|
siTokenRevocationInterval = 5 * time.Minute
|
2019-12-06 20:46:46 +00:00
|
|
|
)
|
|
|
|
|
2020-07-28 20:12:08 +00:00
|
|
|
const (
|
|
|
|
// configEntriesRequestRateLimit is the maximum number of requests per second
|
|
|
|
// Nomad will make against Consul for operations on global Configuration Entry
|
|
|
|
// objects.
|
|
|
|
configEntriesRequestRateLimit rate.Limit = 10
|
|
|
|
)
|
|
|
|
|
2019-12-06 20:46:46 +00:00
|
|
|
const (
|
|
|
|
// ConsulPolicyWrite is the literal text of the policy field of a Consul Policy
|
|
|
|
// Rule that we check when validating an Operator Consul token against the
|
|
|
|
// necessary permissions for creating a Service Identity token for a given
|
|
|
|
// service.
|
|
|
|
//
|
|
|
|
// The rule may be:
|
|
|
|
// - service.<exact>
|
|
|
|
// - service."*" (wildcard)
|
|
|
|
// - service_prefix.<matching> (including empty string)
|
|
|
|
//
|
|
|
|
// e.g.
|
|
|
|
// service "web" { policy = "write" }
|
|
|
|
// service_prefix "" { policy = "write" }
|
|
|
|
ConsulPolicyWrite = "write"
|
|
|
|
)
|
|
|
|
|
2020-05-18 19:21:12 +00:00
|
|
|
type ServiceIdentityRequest struct {
|
|
|
|
TaskKind structs.TaskKind
|
|
|
|
TaskName string
|
2019-12-06 20:46:46 +00:00
|
|
|
ClusterID string
|
|
|
|
AllocID string
|
|
|
|
}
|
|
|
|
|
2020-05-18 19:21:12 +00:00
|
|
|
func (sir ServiceIdentityRequest) Validate() error {
|
2019-12-06 20:46:46 +00:00
|
|
|
switch {
|
2020-05-18 19:21:12 +00:00
|
|
|
case sir.ClusterID == "":
|
2019-12-06 20:46:46 +00:00
|
|
|
return errors.New("cluster id not set")
|
2020-05-18 19:21:12 +00:00
|
|
|
case sir.AllocID == "":
|
2019-12-06 20:46:46 +00:00
|
|
|
return errors.New("alloc id not set")
|
2020-05-18 19:21:12 +00:00
|
|
|
case sir.TaskName == "":
|
2019-12-06 20:46:46 +00:00
|
|
|
return errors.New("task name not set")
|
2020-05-18 19:21:12 +00:00
|
|
|
case sir.TaskKind == "":
|
|
|
|
return errors.New("task kind not set")
|
2019-12-06 20:46:46 +00:00
|
|
|
default:
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-18 19:21:12 +00:00
|
|
|
func (sir ServiceIdentityRequest) Description() string {
|
|
|
|
return fmt.Sprintf(siTokenDescriptionFmt, sir.ClusterID, sir.AllocID, sir.TaskName)
|
2019-12-06 20:46:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ConsulACLsAPI is an abstraction over the consul/api.ACL API used by Nomad
|
|
|
|
// Server.
|
2020-03-27 20:07:55 +00:00
|
|
|
//
|
|
|
|
// ACL requirements
|
|
|
|
// - acl:write (transitive through ACLsAPI)
|
2019-12-06 20:46:46 +00:00
|
|
|
type ConsulACLsAPI interface {
|
|
|
|
|
|
|
|
// CheckSIPolicy checks that the given operator token has the equivalent ACL
|
|
|
|
// permissiveness that a Service Identity token policy for task would have.
|
|
|
|
CheckSIPolicy(ctx context.Context, task, secretID string) error
|
|
|
|
|
|
|
|
// Create instructs Consul to create a Service Identity token.
|
2020-05-18 19:21:12 +00:00
|
|
|
CreateToken(context.Context, ServiceIdentityRequest) (*structs.SIToken, error)
|
2019-12-06 20:46:46 +00:00
|
|
|
|
|
|
|
// RevokeTokens instructs Consul to revoke the given token accessors.
|
2020-01-02 15:03:05 +00:00
|
|
|
RevokeTokens(context.Context, []*structs.SITokenAccessor, bool) bool
|
2019-12-06 20:46:46 +00:00
|
|
|
|
2020-05-21 12:18:12 +00:00
|
|
|
// MarkForRevocation marks the tokens for background revocation
|
|
|
|
MarkForRevocation([]*structs.SITokenAccessor)
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
// Stop is used to stop background token revocations. Intended to be used
|
|
|
|
// on Nomad Server shutdown.
|
|
|
|
Stop()
|
|
|
|
|
|
|
|
// todo(shoenig): use list endpoint for finding orphaned tokens
|
2019-12-06 20:46:46 +00:00
|
|
|
// ListTokens lists every token in Consul.
|
2020-01-02 15:03:05 +00:00
|
|
|
// ListTokens() ([]string, error)
|
|
|
|
}
|
|
|
|
|
|
|
|
// PurgeSITokenAccessorFunc is called to remove SI Token accessors from the
|
|
|
|
// system (i.e. raft). If the function returns an error, the token will still
|
|
|
|
// be tracked and revocation attempts will retry in the background until there
|
|
|
|
// is a success.
|
|
|
|
type PurgeSITokenAccessorFunc func([]*structs.SITokenAccessor) error
|
|
|
|
|
|
|
|
type SITokenStats struct {
|
|
|
|
TrackedForRevoke int
|
2019-12-06 20:46:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type consulACLsAPI struct {
|
|
|
|
// aclClient is the API subset of the real consul client we need for
|
2020-01-02 15:03:05 +00:00
|
|
|
// managing Service Identity tokens
|
2019-12-06 20:46:46 +00:00
|
|
|
aclClient consul.ACLsAPI
|
|
|
|
|
|
|
|
// limiter is used to rate limit requests to consul
|
|
|
|
limiter *rate.Limiter
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
bgRevokeLock sync.Mutex
|
|
|
|
// Track accessors that must have their revocation retried in the background.
|
|
|
|
bgRetryRevocation []*structs.SITokenAccessor
|
|
|
|
// Track whether the background revocations have been stopped, to avoid
|
|
|
|
// creating tokens we would no longer be able to revoke. Expected to be used
|
|
|
|
// on a Server shutdown.
|
|
|
|
bgRevokeStopped bool
|
|
|
|
|
|
|
|
// purgeFunc is the Nomad Server function that removes the reference to the
|
|
|
|
// SI token accessor from the persistent raft store
|
|
|
|
purgeFunc PurgeSITokenAccessorFunc
|
|
|
|
|
|
|
|
// stopC is used to signal the client is shutting down and token revocation
|
|
|
|
// background goroutine should stop
|
|
|
|
stopC chan struct{}
|
|
|
|
|
2019-12-06 20:46:46 +00:00
|
|
|
// logger is used to log messages
|
|
|
|
logger hclog.Logger
|
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
func NewConsulACLsAPI(aclClient consul.ACLsAPI, logger hclog.Logger, purgeFunc PurgeSITokenAccessorFunc) *consulACLsAPI {
|
2020-05-22 01:05:53 +00:00
|
|
|
if purgeFunc == nil {
|
|
|
|
purgeFunc = func([]*structs.SITokenAccessor) error { return nil }
|
|
|
|
}
|
|
|
|
|
2019-12-06 20:46:46 +00:00
|
|
|
c := &consulACLsAPI{
|
|
|
|
aclClient: aclClient,
|
2020-01-02 15:03:05 +00:00
|
|
|
limiter: rate.NewLimiter(siTokenRequestRateLimit, int(siTokenRequestRateLimit)),
|
|
|
|
stopC: make(chan struct{}),
|
|
|
|
purgeFunc: purgeFunc,
|
2019-12-06 20:46:46 +00:00
|
|
|
logger: logger.Named("consul_acl"),
|
|
|
|
}
|
2020-01-02 15:03:05 +00:00
|
|
|
|
|
|
|
go c.bgRetryRevokeDaemon()
|
|
|
|
|
|
|
|
return c
|
|
|
|
}
|
|
|
|
|
|
|
|
// Stop stops background token revocations from happening. Once stopped, tokens
|
|
|
|
// may no longer be created.
|
|
|
|
func (c *consulACLsAPI) Stop() {
|
|
|
|
c.bgRevokeLock.Lock()
|
|
|
|
defer c.bgRevokeLock.Unlock()
|
|
|
|
|
|
|
|
c.stopC <- struct{}{}
|
|
|
|
c.bgRevokeStopped = true
|
2019-12-06 20:46:46 +00:00
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
func (c *consulACLsAPI) CheckSIPolicy(ctx context.Context, task, secretID string) error {
|
|
|
|
defer metrics.MeasureSince([]string{"nomad", "consul", "check_si_policy"}, time.Now())
|
|
|
|
|
2019-12-06 20:46:46 +00:00
|
|
|
if id := strings.TrimSpace(secretID); id == "" {
|
|
|
|
return errors.New("missing consul token")
|
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
// Ensure we are under our rate limit.
|
|
|
|
if err := c.limiter.Wait(ctx); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2019-12-06 20:46:46 +00:00
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
opToken, _, err := c.aclClient.TokenReadSelf(&api.QueryOptions{
|
2019-12-06 20:46:46 +00:00
|
|
|
AllowStale: false,
|
|
|
|
Token: secretID,
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return errors.Wrap(err, "unable to validate operator consul token")
|
|
|
|
}
|
|
|
|
|
|
|
|
allowable, err := c.hasSufficientPolicy(task, opToken)
|
|
|
|
if err != nil {
|
|
|
|
return errors.Wrap(err, "unable to validate operator consul token")
|
|
|
|
}
|
|
|
|
if !allowable {
|
|
|
|
return errors.Errorf("permission denied for %q", task)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-05-18 19:21:12 +00:00
|
|
|
func (c *consulACLsAPI) CreateToken(ctx context.Context, sir ServiceIdentityRequest) (*structs.SIToken, error) {
|
2019-12-06 20:46:46 +00:00
|
|
|
defer metrics.MeasureSince([]string{"nomad", "consul", "create_token"}, time.Now())
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
// make sure the background token revocations have not been stopped
|
|
|
|
c.bgRevokeLock.Lock()
|
|
|
|
stopped := c.bgRevokeStopped
|
|
|
|
c.bgRevokeLock.Unlock()
|
|
|
|
|
|
|
|
if stopped {
|
|
|
|
return nil, errors.New("client stopped and may no longer create tokens")
|
|
|
|
}
|
|
|
|
|
2019-12-06 20:46:46 +00:00
|
|
|
// sanity check the metadata for the token we want
|
2020-05-18 19:21:12 +00:00
|
|
|
if err := sir.Validate(); err != nil {
|
2019-12-06 20:46:46 +00:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
// the SI token created must be for the service, not the sidecar of the service
|
2019-12-19 23:40:30 +00:00
|
|
|
// https://www.consul.io/docs/acl/acl-system.html#acl-service-identities
|
2020-05-18 19:21:12 +00:00
|
|
|
service := sir.TaskKind.Value()
|
2019-12-06 20:46:46 +00:00
|
|
|
partial := &api.ACLToken{
|
2020-05-18 19:21:12 +00:00
|
|
|
Description: sir.Description(),
|
|
|
|
ServiceIdentities: []*api.ACLServiceIdentity{{ServiceName: service}},
|
2019-12-06 20:46:46 +00:00
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
// Ensure we are under our rate limit.
|
|
|
|
if err := c.limiter.Wait(ctx); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2019-12-06 20:46:46 +00:00
|
|
|
token, _, err := c.aclClient.TokenCreate(partial, nil)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return &structs.SIToken{
|
2020-05-18 19:21:12 +00:00
|
|
|
TaskName: sir.TaskName,
|
2019-12-06 20:46:46 +00:00
|
|
|
AccessorID: token.AccessorID,
|
|
|
|
SecretID: token.SecretID,
|
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
// RevokeTokens revokes the passed set of SI token accessors. If committed is set,
|
|
|
|
// the client's purge function is called (which purges the tokens from the Server's
|
|
|
|
// persistent store). If there is an error purging either because of Consul failures
|
|
|
|
// or because of the purge function, the revocation is retried in the background.
|
|
|
|
//
|
|
|
|
// The revocation of an SI token accessor is idempotent.
|
|
|
|
//
|
|
|
|
// A return value of true indicates one or more accessors were stored for
|
|
|
|
// a revocation retry attempt in the background (intended for tests).
|
|
|
|
func (c *consulACLsAPI) RevokeTokens(ctx context.Context, accessors []*structs.SITokenAccessor, committed bool) bool {
|
2019-12-06 20:46:46 +00:00
|
|
|
defer metrics.MeasureSince([]string{"nomad", "consul", "revoke_tokens"}, time.Now())
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
nTokens := float32(len(accessors))
|
2019-12-06 20:46:46 +00:00
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
if err := c.parallelRevoke(ctx, accessors); err != nil {
|
|
|
|
// If these tokens were uncommitted into raft, it is a best effort to
|
|
|
|
// revoke them now. If this immediate revocation does not work, Nomad loses
|
|
|
|
// track of them and will need to do a brute reconciliation later. This
|
|
|
|
// should happen rarely, and will be implemented soon.
|
|
|
|
if !committed {
|
|
|
|
metrics.IncrCounter([]string{"nomad", "consul", "undistributed_si_tokens_abandoned"}, nTokens)
|
2019-12-06 20:46:46 +00:00
|
|
|
}
|
2020-01-02 15:03:05 +00:00
|
|
|
|
|
|
|
c.logger.Warn("failed to revoke tokens, will reattempt later", "error", err)
|
|
|
|
c.storeForRevocation(accessors)
|
|
|
|
return true
|
2019-12-06 20:46:46 +00:00
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
if !committed {
|
|
|
|
// Un-committed tokens were revoked without incident (nothing to purge)
|
|
|
|
metrics.IncrCounter([]string{"nomad", "consul", "undistributed_si_tokens_revoked"}, nTokens)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
// Committed tokens were revoked without incident, now purge them
|
|
|
|
if err := c.purgeFunc(accessors); err != nil {
|
|
|
|
c.logger.Error("failed to purge SI token accessors", "error", err)
|
|
|
|
c.storeForRevocation(accessors)
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
// Track that the SI tokens were revoked and purged successfully
|
|
|
|
metrics.IncrCounter([]string{"nomad", "consul", "distributed_si_tokens_revoked"}, nTokens)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2020-05-21 12:18:12 +00:00
|
|
|
func (c *consulACLsAPI) MarkForRevocation(accessors []*structs.SITokenAccessor) {
|
|
|
|
c.storeForRevocation(accessors)
|
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
func (c *consulACLsAPI) storeForRevocation(accessors []*structs.SITokenAccessor) {
|
|
|
|
c.bgRevokeLock.Lock()
|
|
|
|
defer c.bgRevokeLock.Unlock()
|
|
|
|
|
|
|
|
// copy / append the set of accessors we must track for revocation in the
|
|
|
|
// background
|
|
|
|
c.bgRetryRevocation = append(c.bgRetryRevocation, accessors...)
|
2019-12-06 20:46:46 +00:00
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
func (c *consulACLsAPI) parallelRevoke(ctx context.Context, accessors []*structs.SITokenAccessor) error {
|
|
|
|
g, pCtx := errgroup.WithContext(ctx)
|
|
|
|
|
|
|
|
// Cap the handlers
|
|
|
|
handlers := len(accessors)
|
|
|
|
if handlers > siTokenMaxParallelRevokes {
|
|
|
|
handlers = siTokenMaxParallelRevokes
|
|
|
|
}
|
|
|
|
|
|
|
|
// Revoke the SI Token Accessors
|
|
|
|
input := make(chan *structs.SITokenAccessor, handlers)
|
|
|
|
for i := 0; i < handlers; i++ {
|
|
|
|
g.Go(func() error {
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case accessor, ok := <-input:
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if err := c.singleRevoke(ctx, accessor); err != nil {
|
|
|
|
return errors.Wrapf(err,
|
|
|
|
"failed to revoke SI token accessor (alloc %q, node %q, task %q)",
|
|
|
|
accessor.AllocID, accessor.NodeID, accessor.TaskName,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
case <-pCtx.Done():
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// Send the input
|
|
|
|
go func() {
|
|
|
|
defer close(input)
|
|
|
|
for _, accessor := range accessors {
|
|
|
|
select {
|
|
|
|
case <-pCtx.Done():
|
|
|
|
return
|
|
|
|
case input <- accessor:
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
// Wait for everything to complete
|
|
|
|
return g.Wait()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *consulACLsAPI) singleRevoke(ctx context.Context, accessor *structs.SITokenAccessor) error {
|
2019-12-06 20:46:46 +00:00
|
|
|
c.logger.Trace("revoke SI token", "task", accessor.TaskName, "alloc_id", accessor.AllocID, "node_id", accessor.NodeID)
|
2020-01-02 15:03:05 +00:00
|
|
|
|
|
|
|
// Ensure we are under our rate limit.
|
|
|
|
if err := c.limiter.Wait(ctx); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Consul will no-op the deletion of a non-existent token (no error)
|
2019-12-06 20:46:46 +00:00
|
|
|
_, err := c.aclClient.TokenDelete(accessor.AccessorID, nil)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
func (c *consulACLsAPI) bgRetryRevokeDaemon() {
|
2020-03-27 20:07:55 +00:00
|
|
|
ticker := time.NewTicker(siTokenRevocationInterval)
|
2020-01-02 15:03:05 +00:00
|
|
|
defer ticker.Stop()
|
|
|
|
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-c.stopC:
|
|
|
|
return
|
|
|
|
case <-ticker.C:
|
|
|
|
c.bgRetryRevoke()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-21 12:18:12 +00:00
|
|
|
// maxConsulRevocationBatchSize is the maximum tokens a bgRetryRevoke should revoke
|
|
|
|
// at any given time.
|
|
|
|
const maxConsulRevocationBatchSize = 1000
|
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
func (c *consulACLsAPI) bgRetryRevoke() {
|
|
|
|
c.bgRevokeLock.Lock()
|
|
|
|
defer c.bgRevokeLock.Unlock()
|
|
|
|
|
|
|
|
// fast path, nothing to do
|
|
|
|
if len(c.bgRetryRevocation) == 0 {
|
|
|
|
return
|
|
|
|
}
|
2019-12-06 20:46:46 +00:00
|
|
|
|
2020-01-02 15:03:05 +00:00
|
|
|
// unlike vault tokens, SI tokens do not have a TTL, and so we must try to
|
|
|
|
// remove all SI token accessors, every time, until they're gone
|
2020-05-21 12:18:12 +00:00
|
|
|
toRevoke := len(c.bgRetryRevocation)
|
|
|
|
if toRevoke > maxConsulRevocationBatchSize {
|
|
|
|
toRevoke = maxConsulRevocationBatchSize
|
|
|
|
}
|
|
|
|
toPurge := make([]*structs.SITokenAccessor, toRevoke)
|
2020-01-02 15:03:05 +00:00
|
|
|
copy(toPurge, c.bgRetryRevocation)
|
|
|
|
|
|
|
|
if err := c.parallelRevoke(context.Background(), toPurge); err != nil {
|
2020-01-07 17:58:29 +00:00
|
|
|
c.logger.Warn("background SI token revocation failed", "error", err)
|
2020-01-02 15:03:05 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Call the revocation function
|
|
|
|
if err := c.purgeFunc(toPurge); err != nil {
|
|
|
|
// Just try again later (revocation is idempotent)
|
2020-01-07 17:58:29 +00:00
|
|
|
c.logger.Error("background SI token purge failed", "error", err)
|
2020-01-02 15:03:05 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Track that the SI tokens were revoked successfully
|
|
|
|
nTokens := float32(len(toPurge))
|
|
|
|
metrics.IncrCounter([]string{"nomad", "consul", "distributed_tokens_revoked"}, nTokens)
|
|
|
|
|
|
|
|
// Reset the list of accessors to retry, since we just removed them all.
|
|
|
|
c.bgRetryRevocation = nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *consulACLsAPI) ListTokens() ([]string, error) {
|
|
|
|
// defer metrics.MeasureSince([]string{"nomad", "consul", "list_tokens"}, time.Now())
|
2019-12-06 20:46:46 +00:00
|
|
|
return nil, errors.New("not yet implemented")
|
|
|
|
}
|
2020-01-02 15:03:05 +00:00
|
|
|
|
|
|
|
// purgeSITokenAccessors is the Nomad Server method which will remove the set
|
|
|
|
// of SI token accessors from the persistent raft store.
|
|
|
|
func (s *Server) purgeSITokenAccessors(accessors []*structs.SITokenAccessor) error {
|
|
|
|
// Commit this update via Raft
|
|
|
|
request := structs.SITokenAccessorsRequest{Accessors: accessors}
|
|
|
|
_, _, err := s.raftApply(structs.ServiceIdentityAccessorDeregisterRequestType, request)
|
|
|
|
return err
|
|
|
|
}
|
2020-07-28 20:12:08 +00:00
|
|
|
|
|
|
|
// ConsulConfigsAPI is an abstraction over the consul/api.ConfigEntries API used by
|
|
|
|
// Nomad Server.
|
|
|
|
//
|
|
|
|
// Nomad will only perform write operations on Consul Ingress Gateway Configuration Entries.
|
|
|
|
// Removing the entries is not particularly safe, given that multiple Nomad clusters
|
|
|
|
// may be writing to the same config entries, which are global in the Consul scope.
|
|
|
|
type ConsulConfigsAPI interface {
|
2020-12-15 20:38:33 +00:00
|
|
|
// SetIngressCE adds the given ConfigEntry to Consul, overwriting
|
2020-07-28 20:12:08 +00:00
|
|
|
// the previous entry if set.
|
2020-12-15 20:38:33 +00:00
|
|
|
SetIngressCE(ctx context.Context, service string, entry *structs.ConsulIngressConfigEntry) error
|
|
|
|
|
|
|
|
// SetTerminatingCE adds the given ConfigEntry to Consul, overwriting
|
|
|
|
// the previous entry if set.
|
|
|
|
SetTerminatingCE(ctx context.Context, service string, entry *structs.ConsulTerminatingConfigEntry) error
|
2020-07-28 20:12:08 +00:00
|
|
|
|
|
|
|
// Stop is used to stop additional creations of Configuration Entries. Intended to
|
|
|
|
// be used on Nomad Server shutdown.
|
|
|
|
Stop()
|
|
|
|
}
|
|
|
|
|
|
|
|
type consulConfigsAPI struct {
|
|
|
|
// configsClient is the API subset of the real Consul client we need for
|
|
|
|
// managing Configuration Entries.
|
|
|
|
configsClient consul.ConfigAPI
|
|
|
|
|
|
|
|
// limiter is used to rate limit requests to Consul
|
|
|
|
limiter *rate.Limiter
|
|
|
|
|
|
|
|
// logger is used to log messages
|
|
|
|
logger hclog.Logger
|
|
|
|
|
|
|
|
// lock protects the stopped flag, which prevents use of the consul configs API
|
|
|
|
// client after shutdown.
|
|
|
|
lock sync.Mutex
|
|
|
|
stopped bool
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewConsulConfigsAPI(configsClient consul.ConfigAPI, logger hclog.Logger) *consulConfigsAPI {
|
|
|
|
return &consulConfigsAPI{
|
|
|
|
configsClient: configsClient,
|
|
|
|
limiter: rate.NewLimiter(configEntriesRequestRateLimit, int(configEntriesRequestRateLimit)),
|
|
|
|
logger: logger,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *consulConfigsAPI) Stop() {
|
|
|
|
c.lock.Lock()
|
|
|
|
defer c.lock.Unlock()
|
|
|
|
c.stopped = true
|
|
|
|
}
|
|
|
|
|
2020-12-15 20:38:33 +00:00
|
|
|
func (c *consulConfigsAPI) SetIngressCE(ctx context.Context, service string, entry *structs.ConsulIngressConfigEntry) error {
|
|
|
|
return c.setCE(ctx, convertIngressCE(service, entry))
|
2020-07-28 20:12:08 +00:00
|
|
|
}
|
|
|
|
|
2020-12-15 20:38:33 +00:00
|
|
|
func (c *consulConfigsAPI) SetTerminatingCE(ctx context.Context, service string, entry *structs.ConsulTerminatingConfigEntry) error {
|
|
|
|
return c.setCE(ctx, convertTerminatingCE(service, entry))
|
|
|
|
}
|
|
|
|
|
|
|
|
// also mesh
|
|
|
|
|
|
|
|
// setCE will set the Configuration Entry of any type Consul supports.
|
|
|
|
func (c *consulConfigsAPI) setCE(ctx context.Context, entry api.ConfigEntry) error {
|
2020-07-28 20:12:08 +00:00
|
|
|
defer metrics.MeasureSince([]string{"nomad", "consul", "create_config_entry"}, time.Now())
|
|
|
|
|
|
|
|
// make sure the background deletion goroutine has not been stopped
|
|
|
|
c.lock.Lock()
|
|
|
|
stopped := c.stopped
|
|
|
|
c.lock.Unlock()
|
|
|
|
|
|
|
|
if stopped {
|
|
|
|
return errors.New("client stopped and may not longer create config entries")
|
|
|
|
}
|
|
|
|
|
|
|
|
// ensure we are under our wait limit
|
|
|
|
if err := c.limiter.Wait(ctx); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
_, _, err := c.configsClient.Set(entry, nil)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2020-12-15 20:38:33 +00:00
|
|
|
func convertIngressCE(service string, entry *structs.ConsulIngressConfigEntry) api.ConfigEntry {
|
2020-07-28 20:12:08 +00:00
|
|
|
var listeners []api.IngressListener = nil
|
|
|
|
for _, listener := range entry.Listeners {
|
|
|
|
var services []api.IngressService = nil
|
2020-12-15 20:38:33 +00:00
|
|
|
for _, s := range listener.Services {
|
2020-07-28 20:12:08 +00:00
|
|
|
services = append(services, api.IngressService{
|
2020-12-15 20:38:33 +00:00
|
|
|
Name: s.Name,
|
|
|
|
Hosts: helper.CopySliceString(s.Hosts),
|
2020-07-28 20:12:08 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
listeners = append(listeners, api.IngressListener{
|
|
|
|
Port: listener.Port,
|
|
|
|
Protocol: listener.Protocol,
|
|
|
|
Services: services,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
tlsEnabled := false
|
|
|
|
if entry.TLS != nil && entry.TLS.Enabled {
|
|
|
|
tlsEnabled = true
|
|
|
|
}
|
|
|
|
|
|
|
|
return &api.IngressGatewayConfigEntry{
|
|
|
|
Kind: api.IngressGateway,
|
|
|
|
Name: service,
|
|
|
|
TLS: api.GatewayTLSConfig{Enabled: tlsEnabled},
|
|
|
|
Listeners: listeners,
|
|
|
|
}
|
|
|
|
}
|
2020-12-15 20:38:33 +00:00
|
|
|
|
|
|
|
func convertTerminatingCE(service string, entry *structs.ConsulTerminatingConfigEntry) api.ConfigEntry {
|
|
|
|
var linked []api.LinkedService = nil
|
|
|
|
for _, s := range entry.Services {
|
|
|
|
linked = append(linked, api.LinkedService{
|
|
|
|
Name: s.Name,
|
|
|
|
CAFile: s.CAFile,
|
|
|
|
CertFile: s.CertFile,
|
|
|
|
KeyFile: s.KeyFile,
|
|
|
|
SNI: s.SNI,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
return &api.TerminatingGatewayConfigEntry{
|
|
|
|
Kind: api.TerminatingGateway,
|
|
|
|
Name: service,
|
|
|
|
Services: linked,
|
|
|
|
}
|
|
|
|
}
|