Set request token entry within fetchACLTokenEntryAndEntity (#5880)

hashicorp · Dec 3, 2018 · e9751fd · e9751fd
1 parent 1bc959a
commit e9751fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/command/seal_migration_test.go b/command/seal_migration_test.go
@@ -1,3 +1,5 @@
+// +build !enterprise
+
 package command
 
 import (

diff --git a/vault/core.go b/vault/core.go
@@ -1146,8 +1146,6 @@ func (c *Core) sealInitCommon(ctx context.Context, req *logical.Request) (retErr
 		return retErr
 	}
 
-	req.SetTokenEntry(te)
-
 	// Audit-log the request before going any further
 	auth := &logical.Auth{
 		ClientToken: req.ClientToken,

diff --git a/vault/request_handling.go b/vault/request_handling.go
@@ -136,6 +136,8 @@ func (c *Core) fetchACLTokenEntryAndEntity(ctx context.Context, req *logical.Req
 			c.logger.Error("failed to lookup token", "error", err)
 			return nil, nil, nil, nil, ErrInternalError
 		}
+		// Set the token entry here since it has not been cached yet
+		req.SetTokenEntry(te)
 	default:
 		te = req.TokenEntry()
 	}