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

acl: small OSS refactors to help ensure that auth methods with namespace rules work with partitions (#11323)

This commit is contained in:
R.B. Boyer 2021-10-14 15:38:05 -05:00 committed by GitHub
parent 07425b149c
commit 55dd52cb17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/11323.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
acl: **(Enterprise only)** ensure that auth methods with namespace rules work with partitions
```

2
agent/consul/acl_endpoint_oss.go
View File

@ -19,5 +19,5 @@ func computeTargetEnterpriseMeta(
method *structs.ACLAuthMethod,
verifiedIdentity *authmethod.Identity,
) (*structs.EnterpriseMeta, error) {
return method.TargetEnterpriseMeta(verifiedIdentity.EnterpriseMeta), nil
return &structs.EnterpriseMeta{}, nil
}

4
agent/structs/acl_oss.go
View File

@ -70,10 +70,6 @@ func (p *ACLPolicy) EnterprisePolicyMeta() *acl.EnterprisePolicyMeta {
return nil
}
func (m *ACLAuthMethod) TargetEnterpriseMeta(_ *EnterpriseMeta) *EnterpriseMeta {
return &m.EnterpriseMeta
}
func (t *ACLToken) NodeIdentityList() []*ACLNodeIdentity {
if len(t.NodeIdentities) == 0 {
return nil