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

Jump to bottom

Adds missing unlock of RWMutex in OIDC delete key #12916

Merged
merged 2 commits into from Oct 25, 2021
Merged

Adds missing unlock of RWMutex in OIDC delete key #12916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78ff858
Adds missing unlock of RWMutex in OIDC delete key
austingebauer Oct 25, 2021
5f409ab
Adds changelog entry
austingebauer Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/12916.txt
View file
Open in desktop
@@ -0,0 +1,3 @@
```release-note:bug
identity/token: Adds missing call to unlock mutex in key deletion error handling
```
2 changes: 2 additions & 0 deletions vault/identity_store_oidc.go
View file
Open in desktop
Expand Up @@ -703,6 +703,7 @@ func (i *IdentityStore) pathOIDCDeleteKey(ctx context.Context, req *logical.Requ

roleNames, err := i.roleNamesReferencingTargetKeyName(ctx, req, targetKeyName)
if err != nil {
i.oidcLock.Unlock()
return nil, err
}

Expand All @@ -715,6 +716,7 @@ func (i *IdentityStore) pathOIDCDeleteKey(ctx context.Context, req *logical.Requ

clientNames, err := i.clientNamesReferencingTargetKeyName(ctx, req, targetKeyName)
if err != nil {
i.oidcLock.Unlock()
return nil, err
}

Expand Down