Fix panic when creating batch tokens for role that doesn't exist. (#8027

)
hashicorp · Dec 16, 2019 · 59285da · 59285da
1 parent b8c8e39
commit 59285da
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/vault/token_store.go b/vault/token_store.go
@@ -1639,11 +1639,21 @@ func (ts *TokenStore) revokeTreeInternal(ctx context.Context, id string) error {
 }
 
 func (c *Core) IsBatchTokenCreationRequest(ctx context.Context, path string) (bool, error) {
+	c.stateLock.RLock()
+	defer c.stateLock.RUnlock()
+
+	if c.tokenStore == nil {
+		return false, fmt.Errorf("no token store")
+	}
+
 	name := strings.TrimPrefix(path, "auth/token/create/")
 	roleEntry, err := c.tokenStore.tokenStoreRole(ctx, name)
 	if err != nil {
 		return false, err
 	}
+	if roleEntry == nil {
+		return false, fmt.Errorf("unknown role")
+	}
 	return roleEntry.TokenType == logical.TokenTypeBatch, nil
 }