Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix static secret caching race condition #28494

Merged
merged 3 commits into from
Sep 24, 2024
Merged

Fix static secret caching race condition #28494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ea5144
Fix static ssecret caching data race
VioletHynes Sep 24, 2024
6cafc0b
Fix static ssecret caching data race
VioletHynes Sep 24, 2024
a6d97b0
Changelog
VioletHynes Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/28494.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
proxy/cache (enterprise): Fixed a data race that could occur while tracking capabilities in Proxy's static secret cache.
```
2 changes: 2 additions & 0 deletions command/agentproxyshared/cache/lease_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,13 +791,15 @@ func (c *LeaseCache) storeStaticSecretIndex(ctx context.Context, req *SendReques

path := getStaticSecretPathFromRequest(req)

capabilitiesIndex.IndexLock.Lock()
// Extra caution -- avoid potential nil
if capabilitiesIndex.ReadablePaths == nil {
capabilitiesIndex.ReadablePaths = make(map[string]struct{})
}

// update the index with the new capability:
capabilitiesIndex.ReadablePaths[path] = struct{}{}
capabilitiesIndex.IndexLock.Unlock()

err = c.SetCapabilitiesIndex(ctx, capabilitiesIndex)
if err != nil {
Expand Down
Loading