809344a6f5
- Add endpoints related to peering: read, list, generate token, initiate peering - Update node/service/check table indexing to account for peers - Foundational changes for pushing service updates to a peer - Plumb peer name through Health.ServiceNodes path see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679, ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663, ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634, ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555 Co-authored-by: R.B. Boyer <rb@hashicorp.com> Co-authored-by: freddygv <freddy@hashicorp.com> Co-authored-by: Chris S. Kim <ckim@hashicorp.com> Co-authored-by: Evan Culver <eculver@hashicorp.com> Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
539 lines
13 KiB
Go
539 lines
13 KiB
Go
package state
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/go-memdb"
|
|
|
|
"github.com/hashicorp/consul/acl"
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
)
|
|
|
|
const (
|
|
tableACLTokens = "acl-tokens"
|
|
tableACLPolicies = "acl-policies"
|
|
tableACLRoles = "acl-roles"
|
|
tableACLBindingRules = "acl-binding-rules"
|
|
tableACLAuthMethods = "acl-auth-methods"
|
|
|
|
indexAccessor = "accessor"
|
|
indexPolicies = "policies"
|
|
indexRoles = "roles"
|
|
indexAuthMethod = "authmethod"
|
|
indexLocality = "locality"
|
|
indexName = "name"
|
|
indexExpiresGlobal = "expires-global"
|
|
indexExpiresLocal = "expires-local"
|
|
)
|
|
|
|
func tokensTableSchema() *memdb.TableSchema {
|
|
return &memdb.TableSchema{
|
|
Name: tableACLTokens,
|
|
Indexes: map[string]*memdb.IndexSchema{
|
|
indexAccessor: {
|
|
Name: indexAccessor,
|
|
// DEPRECATED (ACL-Legacy-Compat) - we should not AllowMissing here once legacy compat is removed
|
|
AllowMissing: true,
|
|
Unique: true,
|
|
Indexer: indexerSingle{
|
|
readIndex: readIndex(indexFromUUIDString),
|
|
writeIndex: writeIndex(indexAccessorIDFromACLToken),
|
|
},
|
|
},
|
|
indexID: {
|
|
Name: indexID,
|
|
AllowMissing: false,
|
|
Unique: true,
|
|
Indexer: indexerSingle{
|
|
readIndex: readIndex(indexFromStringCaseSensitive),
|
|
writeIndex: writeIndex(indexSecretIDFromACLToken),
|
|
},
|
|
},
|
|
indexPolicies: {
|
|
Name: indexPolicies,
|
|
// Need to allow missing for the anonymous token
|
|
AllowMissing: true,
|
|
Unique: false,
|
|
Indexer: indexerMulti{
|
|
readIndex: readIndex(indexFromUUIDQuery),
|
|
writeIndexMulti: writeIndexMulti(indexPoliciesFromACLToken),
|
|
},
|
|
},
|
|
indexRoles: {
|
|
Name: indexRoles,
|
|
AllowMissing: true,
|
|
Unique: false,
|
|
Indexer: indexerMulti{
|
|
readIndex: readIndex(indexFromUUIDQuery),
|
|
writeIndexMulti: writeIndexMulti(indexRolesFromACLToken),
|
|
},
|
|
},
|
|
indexAuthMethod: {
|
|
Name: indexAuthMethod,
|
|
AllowMissing: true,
|
|
Unique: false,
|
|
Indexer: indexerSingle{
|
|
readIndex: readIndex(indexFromAuthMethodQuery),
|
|
writeIndex: writeIndex(indexAuthMethodFromACLToken),
|
|
},
|
|
},
|
|
indexLocality: {
|
|
Name: indexLocality,
|
|
AllowMissing: false,
|
|
Unique: false,
|
|
Indexer: indexerSingle{
|
|
readIndex: readIndex(indexFromBoolQuery),
|
|
writeIndex: writeIndex(indexLocalFromACLToken),
|
|
},
|
|
},
|
|
indexExpiresGlobal: {
|
|
Name: indexExpiresGlobal,
|
|
AllowMissing: true,
|
|
Unique: false,
|
|
Indexer: indexerSingle{
|
|
readIndex: readIndex(indexFromTimeQuery),
|
|
writeIndex: writeIndex(indexExpiresGlobalFromACLToken),
|
|
},
|
|
},
|
|
indexExpiresLocal: {
|
|
Name: indexExpiresLocal,
|
|
AllowMissing: true,
|
|
Unique: false,
|
|
Indexer: indexerSingle{
|
|
readIndex: readIndex(indexFromTimeQuery),
|
|
writeIndex: writeIndex(indexExpiresLocalFromACLToken),
|
|
},
|
|
},
|
|
|
|
//DEPRECATED (ACL-Legacy-Compat) - This index is only needed while we support upgrading v1 to v2 acls
|
|
// This table indexes all the ACL tokens that do not have an AccessorID
|
|
// TODO(ACL-Legacy-Compat): remove in phase 2
|
|
"needs-upgrade": {
|
|
Name: "needs-upgrade",
|
|
AllowMissing: false,
|
|
Unique: false,
|
|
Indexer: &memdb.ConditionalIndex{
|
|
Conditional: func(obj interface{}) (bool, error) {
|
|
if token, ok := obj.(*structs.ACLToken); ok {
|
|
return token.AccessorID == "", nil
|
|
}
|
|
return false, nil
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func policiesTableSchema() *memdb.TableSchema {
|
|
return &memdb.TableSchema{
|
|
Name: tableACLPolicies,
|
|
Indexes: map[string]*memdb.IndexSchema{
|
|
indexID: {
|
|
Name: indexID,
|
|
AllowMissing: false,
|
|
Unique: true,
|
|
Indexer: &memdb.UUIDFieldIndex{
|
|
Field: "ID",
|
|
},
|
|
},
|
|
indexName: {
|
|
Name: indexName,
|
|
AllowMissing: false,
|
|
Unique: true,
|
|
Indexer: indexerSingleWithPrefix{
|
|
readIndex: indexFromQuery,
|
|
writeIndex: indexNameFromACLPolicy,
|
|
prefixIndex: prefixIndexFromQuery,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func indexNameFromACLPolicy(raw interface{}) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLPolicy)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLPolicy index", raw)
|
|
}
|
|
|
|
if p.Name == "" {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.String(strings.ToLower(p.Name))
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func rolesTableSchema() *memdb.TableSchema {
|
|
return &memdb.TableSchema{
|
|
Name: tableACLRoles,
|
|
Indexes: map[string]*memdb.IndexSchema{
|
|
indexID: {
|
|
Name: indexID,
|
|
AllowMissing: false,
|
|
Unique: true,
|
|
Indexer: &memdb.UUIDFieldIndex{
|
|
Field: "ID",
|
|
},
|
|
},
|
|
indexName: {
|
|
Name: indexName,
|
|
AllowMissing: false,
|
|
Unique: true,
|
|
Indexer: indexerSingleWithPrefix{
|
|
readIndex: indexFromQuery,
|
|
writeIndex: indexNameFromACLRole,
|
|
prefixIndex: prefixIndexFromQuery,
|
|
},
|
|
},
|
|
indexPolicies: {
|
|
Name: indexPolicies,
|
|
// Need to allow missing for the anonymous token
|
|
AllowMissing: true,
|
|
Unique: false,
|
|
Indexer: indexerMulti{
|
|
readIndex: indexFromUUIDQuery,
|
|
writeIndexMulti: multiIndexPolicyFromACLRole,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func indexNameFromACLRole(raw interface{}) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLRole)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLRole index", raw)
|
|
}
|
|
|
|
if p.Name == "" {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.String(strings.ToLower(p.Name))
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexFromUUIDQuery(raw interface{}) ([]byte, error) {
|
|
q, ok := raw.(Query)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for UUIDQuery index", raw)
|
|
}
|
|
return uuidStringToBytes(q.Value)
|
|
}
|
|
|
|
func prefixIndexFromUUIDQuery(arg interface{}) ([]byte, error) {
|
|
switch v := arg.(type) {
|
|
case *acl.EnterpriseMeta:
|
|
return nil, nil
|
|
case acl.EnterpriseMeta:
|
|
return nil, nil
|
|
case Query:
|
|
return variableLengthUUIDStringToBytes(v.Value)
|
|
}
|
|
|
|
return nil, fmt.Errorf("unexpected type %T for Query prefix index", arg)
|
|
}
|
|
|
|
func prefixIndexFromUUIDWithPeerQuery(arg interface{}) ([]byte, error) {
|
|
switch v := arg.(type) {
|
|
case Query:
|
|
var b indexBuilder
|
|
peername := v.PeerOrEmpty()
|
|
if peername == "" {
|
|
b.String(structs.LocalPeerKeyword)
|
|
} else {
|
|
b.String(strings.ToLower(peername))
|
|
}
|
|
uuidBytes, err := variableLengthUUIDStringToBytes(v.Value)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return append(b.Bytes(), uuidBytes...), nil
|
|
}
|
|
|
|
return nil, fmt.Errorf("unexpected type %T for Query prefix index", arg)
|
|
}
|
|
|
|
func multiIndexPolicyFromACLRole(raw interface{}) ([][]byte, error) {
|
|
role, ok := raw.(*structs.ACLRole)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLRole index", raw)
|
|
}
|
|
|
|
count := len(role.Policies)
|
|
if count == 0 {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
vals := make([][]byte, 0, count)
|
|
for _, link := range role.Policies {
|
|
v, err := uuidStringToBytes(link.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
vals = append(vals, v)
|
|
}
|
|
|
|
return vals, nil
|
|
}
|
|
|
|
func bindingRulesTableSchema() *memdb.TableSchema {
|
|
return &memdb.TableSchema{
|
|
Name: tableACLBindingRules,
|
|
Indexes: map[string]*memdb.IndexSchema{
|
|
indexID: {
|
|
Name: indexID,
|
|
AllowMissing: false,
|
|
Unique: true,
|
|
Indexer: indexerSingle{
|
|
readIndex: readIndex(indexFromUUIDString),
|
|
writeIndex: writeIndex(indexIDFromACLBindingRule),
|
|
},
|
|
},
|
|
indexAuthMethod: {
|
|
Name: indexAuthMethod,
|
|
AllowMissing: false,
|
|
Unique: false,
|
|
Indexer: indexerSingle{
|
|
readIndex: indexFromQuery,
|
|
writeIndex: indexAuthMethodFromACLBindingRule,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func indexIDFromACLBindingRule(raw interface{}) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLBindingRule)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLBindingRule index", raw)
|
|
}
|
|
vv, err := uuidStringToBytes(p.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return vv, err
|
|
}
|
|
|
|
func indexAuthMethodFromACLBindingRule(raw interface{}) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLBindingRule)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLBindingRule index", raw)
|
|
}
|
|
|
|
if p.AuthMethod == "" {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.String(strings.ToLower(p.AuthMethod))
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexFromUUIDString(raw interface{}) ([]byte, error) {
|
|
index, ok := raw.(string)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for UUID string index", raw)
|
|
}
|
|
uuid, err := uuidStringToBytes(index)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var b indexBuilder
|
|
b.Raw(uuid)
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexAccessorIDFromACLToken(raw interface{}) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLToken)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLToken index", raw)
|
|
}
|
|
|
|
if p.AccessorID == "" {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
uuid, err := uuidStringToBytes(p.AccessorID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var b indexBuilder
|
|
b.Raw(uuid)
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexSecretIDFromACLToken(raw interface{}) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLToken)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLToken index", raw)
|
|
}
|
|
|
|
if p.SecretID == "" {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.String(p.SecretID)
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexFromStringCaseSensitive(raw interface{}) ([]byte, error) {
|
|
q, ok := raw.(string)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for string prefix query", raw)
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.String(q)
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexPoliciesFromACLToken(raw interface{}) ([][]byte, error) {
|
|
token, ok := raw.(*structs.ACLToken)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLToken index", raw)
|
|
}
|
|
links := token.Policies
|
|
|
|
numLinks := len(links)
|
|
if numLinks == 0 {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
vals := make([][]byte, numLinks)
|
|
|
|
for i, link := range links {
|
|
id, err := uuidStringToBytes(link.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
vals[i] = id
|
|
}
|
|
|
|
return vals, nil
|
|
}
|
|
|
|
func indexRolesFromACLToken(raw interface{}) ([][]byte, error) {
|
|
token, ok := raw.(*structs.ACLToken)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLToken index", raw)
|
|
}
|
|
links := token.Roles
|
|
|
|
numLinks := len(links)
|
|
if numLinks == 0 {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
vals := make([][]byte, numLinks)
|
|
|
|
for i, link := range links {
|
|
id, err := uuidStringToBytes(link.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
vals[i] = id
|
|
}
|
|
|
|
return vals, nil
|
|
}
|
|
|
|
func indexFromBoolQuery(raw interface{}) ([]byte, error) {
|
|
q, ok := raw.(BoolQuery)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for BoolQuery index", raw)
|
|
}
|
|
var b indexBuilder
|
|
b.Bool(q.Value)
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexLocalFromACLToken(raw interface{}) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLToken)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLPolicy index", raw)
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.Bool(p.Local)
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexFromTimeQuery(arg interface{}) ([]byte, error) {
|
|
p, ok := arg.(*TimeQuery)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for TimeQuery index", arg)
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.Time(p.Value)
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func indexExpiresLocalFromACLToken(raw interface{}) ([]byte, error) {
|
|
return indexExpiresFromACLToken(raw, true)
|
|
}
|
|
|
|
func indexExpiresGlobalFromACLToken(raw interface{}) ([]byte, error) {
|
|
return indexExpiresFromACLToken(raw, false)
|
|
}
|
|
|
|
func indexExpiresFromACLToken(raw interface{}, local bool) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLToken)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLToken index", raw)
|
|
}
|
|
if p.Local != local {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
if !p.HasExpirationTime() {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
if p.ExpirationTime.Unix() < 0 {
|
|
return nil, fmt.Errorf("token expiration time cannot be before the unix epoch: %s", p.ExpirationTime)
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.Time(*p.ExpirationTime)
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func authMethodsTableSchema() *memdb.TableSchema {
|
|
return &memdb.TableSchema{
|
|
Name: tableACLAuthMethods,
|
|
Indexes: map[string]*memdb.IndexSchema{
|
|
indexID: {
|
|
Name: indexID,
|
|
AllowMissing: false,
|
|
Unique: true,
|
|
Indexer: indexerSingle{
|
|
readIndex: indexFromQuery,
|
|
writeIndex: indexNameFromACLAuthMethod,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func indexNameFromACLAuthMethod(raw interface{}) ([]byte, error) {
|
|
p, ok := raw.(*structs.ACLAuthMethod)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected type %T for structs.ACLAuthMethod index", raw)
|
|
}
|
|
|
|
if p.Name == "" {
|
|
return nil, errMissingValueForIndex
|
|
}
|
|
|
|
var b indexBuilder
|
|
b.String(strings.ToLower(p.Name))
|
|
return b.Bytes(), nil
|
|
}
|