upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-04-21 22:27:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Remove unnecessary call to DetermineRoleFromLoginRequest (#22603)

Browse source 
* remove unnecessary call to DetermineRoleFromLoginRequest

* add more context to comment
This commit is contained in:
Ellie 2023-08-29 09:56:34 -05:00 committed by GitHub
parent 9cd0d919f5
commit 9b78fd64ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vault/request_handling.go
View file

@ -1253,7 +1253,7 @@ func (c *Core) handleRequest(ctx context.Context, req *logical.Request) (retResp
NamespaceID: ns.ID,
}
// Check for request role
// Check for request role in context to role based quotas
var role string
if reqRole := ctx.Value(logical.CtxKeyRequestRole{}); reqRole != nil {
role = reqRole.(string)
@ -1488,7 +1488,7 @@ func (c *Core) handleLoginRequest(ctx context.Context, req *logical.Request) (re
return
}
// Check for request role
// Check for request role in context to role based quotas
var role string
if reqRole := ctx.Value(logical.CtxKeyRequestRole{}); reqRole != nil {
role = reqRole.(string)

8
vault/wrapping.go
View file

@ -327,8 +327,14 @@ DONELISTHANDLING:
},
}
// Check for request role in context to role based quotas
var role string
if reqRole := ctx.Value(logical.CtxKeyRequestRole{}); reqRole != nil {
role = reqRole.(string)
}
// Register the wrapped token with the expiration manager
if err := c.expiration.RegisterAuth(ctx, &te, wAuth, c.DetermineRoleFromLoginRequest(req.MountPoint, req.Data, ctx)); err != nil {
if err := c.expiration.RegisterAuth(ctx, &te, wAuth, role); err != nil {
// Revoke since it's not yet being tracked for expiration
c.tokenStore.revokeOrphan(ctx, te.ID)
c.logger.Error("failed to register cubbyhole wrapping token lease", "request_path", req.Path, "error", err)