luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

acls: Show `AuthMethodNamespace` when reading/listing ACL token meta (#10598)

This commit is contained in:
Evan Culver 2021-07-15 10:38:52 -07:00 committed by GitHub
parent b4ab87111c
commit 521c423075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/10598.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:enhancement
acls: Show AuthMethodNamespace when reading/listing ACL tokens
```

34
agent/structs/acl.go
View File

@ -572,28 +572,30 @@ type ACLTokenListStub struct {
ModifyIndex uint64 ModifyIndex uint64
Legacy bool `json:",omitempty"` Legacy bool `json:",omitempty"`
EnterpriseMeta EnterpriseMeta
ACLAuthMethodEnterpriseMeta
} }
type ACLTokenListStubs []*ACLTokenListStub type ACLTokenListStubs []*ACLTokenListStub
func (token *ACLToken) Stub() *ACLTokenListStub { func (token *ACLToken) Stub() *ACLTokenListStub {
return &ACLTokenListStub{ return &ACLTokenListStub{
AccessorID: token.AccessorID, AccessorID: token.AccessorID,
SecretID: token.SecretID, SecretID: token.SecretID,
Description: token.Description, Description: token.Description,
Policies: token.Policies, Policies: token.Policies,
Roles: token.Roles, Roles: token.Roles,
ServiceIdentities: token.ServiceIdentities, ServiceIdentities: token.ServiceIdentities,
NodeIdentities: token.NodeIdentities, NodeIdentities: token.NodeIdentities,
Local: token.Local, Local: token.Local,
AuthMethod: token.AuthMethod, AuthMethod: token.AuthMethod,
ExpirationTime: token.ExpirationTime, ExpirationTime: token.ExpirationTime,
CreateTime: token.CreateTime, CreateTime: token.CreateTime,
Hash: token.Hash, Hash: token.Hash,
CreateIndex: token.CreateIndex, CreateIndex: token.CreateIndex,
ModifyIndex: token.ModifyIndex, ModifyIndex: token.ModifyIndex,
Legacy: token.Rules != "", Legacy: token.Rules != "",
EnterpriseMeta: token.EnterpriseMeta, EnterpriseMeta: token.EnterpriseMeta,
ACLAuthMethodEnterpriseMeta: token.ACLAuthMethodEnterpriseMeta,
} }
} }

8
api/acl.go
View File

@ -52,6 +52,10 @@ type ACLToken struct {
// Namespace is the namespace the ACLToken is associated with. // Namespace is the namespace the ACLToken is associated with.
// Namespaces are a Consul Enterprise feature. // Namespaces are a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// AuthMethodNamespace is the namespace the token's AuthMethod is associated with.
// Namespacing is a Consul Enterprise feature.
AuthMethodNamespace string `json:",omitempty"`
} }
type ACLTokenListEntry struct { type ACLTokenListEntry struct {
@ -74,6 +78,10 @@ type ACLTokenListEntry struct {
// Namespace is the namespace the ACLTokenListEntry is associated with. // Namespace is the namespace the ACLTokenListEntry is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// AuthMethodNamespace is the namespace the token's AuthMethod is associated with.
// Namespacing is a Consul Enterprise feature.
AuthMethodNamespace string `json:",omitempty"`
} }
// ACLEntry is used to represent a legacy ACL token // ACLEntry is used to represent a legacy ACL token

4
command/acl/token/formatter.go
View File

@ -58,7 +58,7 @@ func (f *prettyFormatter) FormatToken(token *api.ACLToken) (string, error) {
buffer.WriteString(fmt.Sprintf("Description: %s\n", token.Description)) buffer.WriteString(fmt.Sprintf("Description: %s\n", token.Description))
buffer.WriteString(fmt.Sprintf("Local: %t\n", token.Local)) buffer.WriteString(fmt.Sprintf("Local: %t\n", token.Local))
if token.AuthMethod != "" { if token.AuthMethod != "" {
buffer.WriteString(fmt.Sprintf("Auth Method: %s\n", token.AuthMethod)) buffer.WriteString(fmt.Sprintf("Auth Method: %s (Namespace: %s)\n", token.AuthMethod, token.AuthMethodNamespace))
} }
buffer.WriteString(fmt.Sprintf("Create Time: %v\n", token.CreateTime)) buffer.WriteString(fmt.Sprintf("Create Time: %v\n", token.CreateTime))
if token.ExpirationTime != nil && !token.ExpirationTime.IsZero() { if token.ExpirationTime != nil && !token.ExpirationTime.IsZero() {
@ -132,7 +132,7 @@ func (f *prettyFormatter) formatTokenListEntry(token *api.ACLTokenListEntry) str
buffer.WriteString(fmt.Sprintf("Description: %s\n", token.Description)) buffer.WriteString(fmt.Sprintf("Description: %s\n", token.Description))
buffer.WriteString(fmt.Sprintf("Local: %t\n", token.Local)) buffer.WriteString(fmt.Sprintf("Local: %t\n", token.Local))
if token.AuthMethod != "" { if token.AuthMethod != "" {
buffer.WriteString(fmt.Sprintf("Auth Method: %s\n", token.AuthMethod)) buffer.WriteString(fmt.Sprintf("Auth Method: %s (Namespace: %s)\n", token.AuthMethod, token.AuthMethodNamespace))
} }
buffer.WriteString(fmt.Sprintf("Create Time: %v\n", token.CreateTime)) buffer.WriteString(fmt.Sprintf("Create Time: %v\n", token.CreateTime))
if token.ExpirationTime != nil && !token.ExpirationTime.IsZero() { if token.ExpirationTime != nil && !token.ExpirationTime.IsZero() {

46
command/acl/token/formatter_test.go
View File

@ -66,17 +66,18 @@ func TestFormatToken(t *testing.T) {
}, },
"complex": { "complex": {
token: api.ACLToken{ token: api.ACLToken{
AccessorID: "fbd2447f-7479-4329-ad13-b021d74f86ba", AccessorID: "fbd2447f-7479-4329-ad13-b021d74f86ba",
SecretID: "869c6e91-4de9-4dab-b56e-87548435f9c6", SecretID: "869c6e91-4de9-4dab-b56e-87548435f9c6",
Namespace: "foo", Namespace: "foo",
Description: "test token", Description: "test token",
Local: false, Local: false,
AuthMethod: "bar", AuthMethod: "bar",
CreateTime: time.Date(2020, 5, 22, 18, 52, 31, 0, time.UTC), AuthMethodNamespace: "baz",
ExpirationTime: timeRef(time.Date(2020, 5, 22, 19, 52, 31, 0, time.UTC)), CreateTime: time.Date(2020, 5, 22, 18, 52, 31, 0, time.UTC),
Hash: []byte{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}, ExpirationTime: timeRef(time.Date(2020, 5, 22, 19, 52, 31, 0, time.UTC)),
CreateIndex: 5, Hash: []byte{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'},
ModifyIndex: 10, CreateIndex: 5,
ModifyIndex: 10,
Policies: []*api.ACLLink{ Policies: []*api.ACLLink{
{ {
ID: "beb04680-815b-4d7c-9e33-3d707c24672c", ID: "beb04680-815b-4d7c-9e33-3d707c24672c",
@ -178,17 +179,18 @@ func TestFormatTokenList(t *testing.T) {
"complex": { "complex": {
tokens: []*api.ACLTokenListEntry{ tokens: []*api.ACLTokenListEntry{
{ {
AccessorID: "fbd2447f-7479-4329-ad13-b021d74f86ba", AccessorID: "fbd2447f-7479-4329-ad13-b021d74f86ba",
SecretID: "257ade69-748c-4022-bafd-76d27d9143f8", SecretID: "257ade69-748c-4022-bafd-76d27d9143f8",
Namespace: "foo", Namespace: "foo",
Description: "test token", Description: "test token",
Local: false, Local: false,
AuthMethod: "bar", AuthMethod: "bar",
CreateTime: time.Date(2020, 5, 22, 18, 52, 31, 0, time.UTC), AuthMethodNamespace: "baz",
ExpirationTime: timeRef(time.Date(2020, 5, 22, 19, 52, 31, 0, time.UTC)), CreateTime: time.Date(2020, 5, 22, 18, 52, 31, 0, time.UTC),
Hash: []byte{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'}, ExpirationTime: timeRef(time.Date(2020, 5, 22, 19, 52, 31, 0, time.UTC)),
CreateIndex: 5, Hash: []byte{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'},
ModifyIndex: 10, CreateIndex: 5,
ModifyIndex: 10,
Policies: []*api.ACLLink{ Policies: []*api.ACLLink{
{ {
ID: "beb04680-815b-4d7c-9e33-3d707c24672c", ID: "beb04680-815b-4d7c-9e33-3d707c24672c",

3
command/acl/token/testdata/FormatToken/complex.json.golden vendored
View File

@ -43,5 +43,6 @@
"ExpirationTime": "2020-05-22T19:52:31Z", "ExpirationTime": "2020-05-22T19:52:31Z",
"CreateTime": "2020-05-22T18:52:31Z", "CreateTime": "2020-05-22T18:52:31Z",
"Hash": "YWJjZGVmZ2g=", "Hash": "YWJjZGVmZ2g=",
"Namespace": "foo" "Namespace": "foo",
"AuthMethodNamespace": "baz"
} }

2
command/acl/token/testdata/FormatToken/complex.pretty-meta.golden vendored
View File

@ -3,7 +3,7 @@ SecretID: 869c6e91-4de9-4dab-b56e-87548435f9c6
Namespace: foo Namespace: foo
Description: test token Description: test token
Local: false Local: false
Auth Method: bar Auth Method: bar (Namespace: baz)
Create Time: 2020-05-22 18:52:31 +0000 UTC Create Time: 2020-05-22 18:52:31 +0000 UTC
Expiration Time: 2020-05-22 19:52:31 +0000 UTC Expiration Time: 2020-05-22 19:52:31 +0000 UTC
Hash: 6162636465666768 Hash: 6162636465666768

2
command/acl/token/testdata/FormatToken/complex.pretty.golden vendored
View File

@ -3,7 +3,7 @@ SecretID: 869c6e91-4de9-4dab-b56e-87548435f9c6
Namespace: foo Namespace: foo
Description: test token Description: test token
Local: false Local: false
Auth Method: bar Auth Method: bar (Namespace: baz)
Create Time: 2020-05-22 18:52:31 +0000 UTC Create Time: 2020-05-22 18:52:31 +0000 UTC
Expiration Time: 2020-05-22 19:52:31 +0000 UTC Expiration Time: 2020-05-22 19:52:31 +0000 UTC
Policies: Policies:

3
command/acl/token/testdata/FormatTokenList/complex.json.golden vendored
View File

@ -45,6 +45,7 @@
"CreateTime": "2020-05-22T18:52:31Z", "CreateTime": "2020-05-22T18:52:31Z",
"Hash": "YWJjZGVmZ2g=", "Hash": "YWJjZGVmZ2g=",
"Legacy": false, "Legacy": false,
"Namespace": "foo" "Namespace": "foo",
"AuthMethodNamespace": "baz"
} }
] ]

2
command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden vendored
View File

@ -3,7 +3,7 @@ SecretID: 257ade69-748c-4022-bafd-76d27d9143f8
Namespace: foo Namespace: foo
Description: test token Description: test token
Local: false Local: false
Auth Method: bar Auth Method: bar (Namespace: baz)
Create Time: 2020-05-22 18:52:31 +0000 UTC Create Time: 2020-05-22 18:52:31 +0000 UTC
Expiration Time: 2020-05-22 19:52:31 +0000 UTC Expiration Time: 2020-05-22 19:52:31 +0000 UTC
Legacy: false Legacy: false

2
command/acl/token/testdata/FormatTokenList/complex.pretty.golden vendored
View File

@ -3,7 +3,7 @@ SecretID: 257ade69-748c-4022-bafd-76d27d9143f8
Namespace: foo Namespace: foo
Description: test token Description: test token
Local: false Local: false
Auth Method: bar Auth Method: bar (Namespace: baz)
Create Time: 2020-05-22 18:52:31 +0000 UTC Create Time: 2020-05-22 18:52:31 +0000 UTC
Expiration Time: 2020-05-22 19:52:31 +0000 UTC Expiration Time: 2020-05-22 19:52:31 +0000 UTC
Legacy: false Legacy: false