core/token: fix panic looking up invalid batch tokens (#11415) (#11417)

briankassouf · web-flow · commit 917142287996 · 2021-04-19T18:42:42.000-07:00
diff --git a/vault/token_store.go b/vault/token_store.go
@@ -1162,6 +1162,9 @@ func (ts *TokenStore) lookupBatchToken(ctx context.Context, id string) (*logical
 	if err != nil {
 		return nil, err
 	}
+	if te == nil {
+		return nil, nil
+	}
 
 	if time.Now().After(time.Unix(te.CreationTime, 0).Add(te.TTL)) {
 		return nil, nil

Original file line number	Diff line number	Diff line change
`@@ -1162,6 +1162,9 @@ func (ts TokenStore) lookupBatchToken(ctx context.Context, id string) (logical`
`1162`	`1162`	`if err != nil {`
`1163`	`1163`	`return nil, err`
`1164`	`1164`	`}`
	`1165`	`+ if te == nil {`
	`1166`	`+ return nil, nil`
	`1167`	`+ }`
`1165`	`1168`
`1166`	`1169`	`if time.Now().After(time.Unix(te.CreationTime, 0).Add(te.TTL)) {`
`1167`	`1170`	`return nil, nil`