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

Fix null token type bug (#13236) 

* Fixed null token panic from 'v1/auth/token/' endpoints and returned proper error response

* Fixed panic resulting from null token_type in /auth/token/roles/{role_name} to returne proper error response

* added changelog entry for PR #13236

* edit changelog entry for PR #13236
This commit is contained in:
Anthony (Ryo) Wright 2021-12-06 09:38:53 -08:00 committed by GitHub
parent b59f8b8b4c
commit bcd29f2b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/13236.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
core/token: Fix null token_type panic resulting from 'v1/auth/token/roles/{role_name}' endpoint
```

3
vault/request_handling.go
View File

@ -543,6 +543,9 @@ func (c *Core) handleCancelableRequest(ctx context.Context, req *logical.Request
} }
break break
} }
if token == nil {
return logical.ErrorResponse("bad token"), logical.ErrPermissionDenied
}
_, nsID := namespace.SplitIDFromString(token.(string)) _, nsID := namespace.SplitIDFromString(token.(string))
if nsID != "" { if nsID != "" {
ns, err := NamespaceByID(ctx, nsID, c) ns, err := NamespaceByID(ctx, nsID, c)

3
vault/token_store.go
View File

@ -3348,6 +3348,9 @@ func (ts *TokenStore) tokenStoreRoleCreateUpdate(ctx context.Context, req *logic
oldEntryTokenType := entry.TokenType oldEntryTokenType := entry.TokenType
if tokenTypeRaw, ok := data.Raw["token_type"]; ok { if tokenTypeRaw, ok := data.Raw["token_type"]; ok {
tokenTypeStr = new(string) tokenTypeStr = new(string)
if tokenTypeRaw == nil {
return logical.ErrorResponse("Invalid 'token_type' value: null"), nil
}
*tokenTypeStr = tokenTypeRaw.(string) *tokenTypeStr = tokenTypeRaw.(string)
delete(data.Raw, "token_type") delete(data.Raw, "token_type")
entry.TokenType = logical.TokenTypeDefault entry.TokenType = logical.TokenTypeDefault