scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 19:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clone identity objects to prevent races. (#15123)

Browse Source
This commit is contained in:
Nick Cabatoff
2022-04-22 13:04:34 -04:00
committed by GitHub
parent e580dfd4b8
commit 465a646d22
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/15123.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
core: Fix some identity data races found by Go race detector (no known impact yet).
```

2
vault/identity_store_entities.go
View File

@@ -786,7 +786,7 @@ func (i *IdentityStore) mergeEntity(ctx context.Context, txn *memdb.Txn, toEntit
return errors.New("to_entity_id should not be present in from_entity_ids"), nil return errors.New("to_entity_id should not be present in from_entity_ids"), nil
} }
fromEntity, err := i.MemDBEntityByID(fromEntityID, false) fromEntity, err := i.MemDBEntityByID(fromEntityID, true)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
vault/identity_store_util.go
View File

@@ -667,7 +667,7 @@ func (i *IdentityStore) processLocalAlias(ctx context.Context, lAlias *logical.A
return nil, fmt.Errorf("mount accessor %q is not local", lAlias.MountAccessor) return nil, fmt.Errorf("mount accessor %q is not local", lAlias.MountAccessor)
} }
alias, err := i.MemDBAliasByFactors(lAlias.MountAccessor, lAlias.Name, false, false) alias, err := i.MemDBAliasByFactors(lAlias.MountAccessor, lAlias.Name, true, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }