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

briankassouf · web-flow · commit a10df31ee51d · 2021-04-19T18:43:25.000-07:00
diff --git a/vault/token_store.go b/vault/token_store.go
@@ -1156,6 +1156,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
`@@ -1156,6 +1156,9 @@ func (ts TokenStore) lookupBatchToken(ctx context.Context, id string) (logical`
`1156`	`1156`	`if err != nil {`
`1157`	`1157`	`return nil, err`
`1158`	`1158`	`}`
	`1159`	`+ if te == nil {`
	`1160`	`+ return nil, nil`
	`1161`	`+ }`
`1159`	`1162`
`1160`	`1163`	`if time.Now().After(time.Unix(te.CreationTime, 0).Add(te.TTL)) {`
`1161`	`1164`	`return nil, nil`