Remove unnecessary call to DetermineRoleFromLoginRequest (#22603)

* remove unnecessary call to DetermineRoleFromLoginRequest * add more context to comment
hashicorp · Aug 29, 2023 · 9b78fd6 · 9b78fd6
1 parent 9cd0d91
commit 9b78fd6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/vault/request_handling.go b/vault/request_handling.go
@@ -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)

diff --git a/vault/wrapping.go b/vault/wrapping.go
@@ -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)