mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-12-16 15:01:13 +01:00
Code Issues Projects Releases Wiki Activity

Set TokenParent in the Index to be cached (#10833)

Browse Source 
Co-authored-by: Calvin Leung Huang <cleung2010@gmail.com>
This commit is contained in:
Theron Voran 2021-02-03 18:30:41 -08:00 committed by GitHub
parent 298b9cde2f
commit 38a6f4cf9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/10833.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
agent: Set TokenParent correctly in the Index to be cached.
```

2
command/agent/cache/lease_cache.go vendored
View File

@ -353,7 +353,7 @@ func (c *LeaseCache) Send(ctx context.Context, req *SendRequest) (*SendResponse,
c.logger.Debug("setting parent context", "method", req.Request.Method, "path", req.Request.URL.Path) c.logger.Debug("setting parent context", "method", req.Request.Method, "path", req.Request.URL.Path)
parentCtx = entry.RenewCtxInfo.Ctx parentCtx = entry.RenewCtxInfo.Ctx
entry.TokenParent = req.Token index.TokenParent = req.Token
} }
renewCtxInfo = c.createCtxInfo(parentCtx) renewCtxInfo = c.createCtxInfo(parentCtx)

12
command/agent/cache/lease_cache_test.go vendored
View File

@ -162,6 +162,18 @@ func TestLeaseCache_SendCacheable(t *testing.T) {
t.Fatalf("expected getting proxied response: got %v", diff) t.Fatalf("expected getting proxied response: got %v", diff)
} }
// Check TokenParent
cachedItem, err := lc.db.Get(cachememdb.IndexNameToken, "testtoken")
if err != nil {
t.Fatal(err)
}
if cachedItem == nil {
t.Fatalf("expected token entry from cache")
}
if cachedItem.TokenParent != "autoauthtoken" {
t.Fatalf("unexpected value for tokenparent: %s", cachedItem.TokenParent)
}
// Modify the request a little bit to ensure the second response is // Modify the request a little bit to ensure the second response is
// returned to the lease cache. // returned to the lease cache.
sendReq = &SendRequest{ sendReq = &SendRequest{