mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-09-02 20:41:11 +02:00
Code Issues Projects Releases Wiki Activity

Add read locks to LookupToken/ValidateWrappingToken (#2232)

Browse Source
This commit is contained in:
Jeff Mitchell 2017-01-04 16:52:03 -05:00 committed by GitHub
parent de5d4f8f08
commit d256ae265b
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vault/core.go
View File

@ -508,6 +508,15 @@ func (c *Core) LookupToken(token string) (*TokenEntry, error) {
return nil, fmt.Errorf("missing client token") return nil, fmt.Errorf("missing client token")
} }
c.stateLock.RLock()
defer c.stateLock.RUnlock()
if c.sealed {
return nil, ErrSealed
}
if c.standby {
return nil, ErrStandby
}
// Many tests don't have a token store running // Many tests don't have a token store running
if c.tokenStore == nil { if c.tokenStore == nil {
return nil, nil return nil, nil

9
vault/wrapping.go
View File

@ -271,6 +271,15 @@ func (c *Core) ValidateWrappingToken(req *logical.Request) (bool, error) {
return false, fmt.Errorf("token is empty") return false, fmt.Errorf("token is empty")
} }
c.stateLock.RLock()
defer c.stateLock.RUnlock()
if c.sealed {
return nil, ErrSealed
}
if c.standby {
return nil, ErrStandby
}
te, err := c.tokenStore.Lookup(token) te, err := c.tokenStore.Lookup(token)
if err != nil { if err != nil {
return false, err return false, err