luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Add missing read unlock calls in transit backend code (#12652) 

* Add missing read unlock calls in transit backend code

* Correct formatting in changelog entry
This commit is contained in:
divyapola5 2021-09-28 11:59:30 -05:00 committed by GitHub
parent 92046f7d08
commit 2a194a0804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/logical/transit/backend.go
View File

@ -122,11 +122,13 @@ func (b *backend) GetPolicy(ctx context.Context, polReq keysutil.PolicyRequest,
currentCacheSize := b.lm.GetCacheSize()
storedCacheSize, err := GetCacheSizeFromStorage(ctx, polReq.Storage)
if err != nil {
b.configMutex.RUnlock()
return nil, false, err
}
if currentCacheSize != storedCacheSize {
err = b.lm.InitCache(storedCacheSize)
if err != nil {
b.configMutex.RUnlock()
return nil, false, err
}
}
@ -135,6 +137,8 @@ func (b *backend) GetPolicy(ctx context.Context, polReq keysutil.PolicyRequest,
b.configMutex.Lock()
defer b.configMutex.Unlock()
b.cacheSizeChanged = false
} else {
b.configMutex.RUnlock()
}
p, _, err := b.lm.GetPolicy(ctx, polReq, rand)
if err != nil {

11
builtin/logical/transit/path_cache_config.go
View File

@ -86,16 +86,19 @@ func (b *backend) pathCacheConfigRead(ctx context.Context, req *logical.Request,
return nil, err
}
if currentCacheSize != storedCacheSize {
err = b.lm.InitCache(storedCacheSize)
if err != nil {
return nil, err
}
}
resp := &logical.Response{
Data: map[string]interface{}{
"size": storedCacheSize,
},
}
if currentCacheSize != storedCacheSize {
resp.Warnings = []string{"This cache size will not be applied until the transit mount is reloaded"}
}
return resp, nil
}

3
changelog/12418.txt
View File

@ -1,4 +1,3 @@
```release-note:bug
Enforce minimum cache size for transit backend.
Init cache size on transit backend without restart.
secrets/transit: Enforce minimum cache size for transit backend and init cache size on transit backend without restart.
```