scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-29 09:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent memory leak when using control group factors in a policy (#17532)

Browse Source 
* prevent a possible memory leak when using control group factors in a policy

* CL
This commit is contained in:
Hamid Ghaf
2022-10-14 19:15:15 -04:00
committed by GitHub
parent 46534fa5a6
commit b48b38346f
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/17532.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
core: prevent memory leak when using control group factors in a policy
```

6
vault/acl.go
View File

@@ -260,7 +260,11 @@ func NewACL(ctx context.Context, policies []*Policy) (*ACL, error) {
if pc.Permissions.ControlGroup != nil {
if len(pc.Permissions.ControlGroup.Factors) > 0 {
if existingPerms.ControlGroup == nil {
existingPerms.ControlGroup = pc.Permissions.ControlGroup
cg, err := pc.Permissions.ControlGroup.Clone()
if err != nil {
return nil, err
}
existingPerms.ControlGroup = cg
} else {
existingPerms.ControlGroup.Factors = append(existingPerms.ControlGroup.Factors, pc.Permissions.ControlGroup.Factors...)
}

11
vault/policy.go
View File

@@ -149,6 +149,17 @@ type ControlGroup struct {
Factors []*ControlGroupFactor
}
func (c *ControlGroup) Clone() (*ControlGroup, error) {
clonedControlGroup, err := copystructure.Copy(c)
if err != nil {
return nil, err
}
cg := clonedControlGroup.(*ControlGroup)
return cg, nil
}
type ControlGroupFactor struct {
Name string
Identity *IdentityFactor `hcl:"identity"`