Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support batch tokens in renewer and caching proxy for transit auto-unseal #7441

Merged
merged 8 commits into from
Sep 9, 2019
Merged

Support batch tokens in renewer and caching proxy for transit auto-unseal #7441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bb59665
Update renewer to handle batch tokens
Sep 6, 2019
142171e
Allow not passing a token into transit autoseal
jefferai Sep 6, 2019
9eb9a3c
Use a proper lease duration calculation for batch tokens
jefferai Sep 6, 2019
98df3fc
Don't run transit seal renewer if token is blank
jefferai Sep 6, 2019
071a66b
Make the non renewable case generic instead of special-casing batch t…
jefferai Sep 6, 2019
dc2b476
Make same changes to non-token lease renewal
jefferai Sep 6, 2019
0b698ff
Move changes out of api package
jefferai Sep 9, 2019
e8e45d1
Port API's renewer to updated logic in agent package and change agent to
jefferai Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions command/agent/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

hclog "github.com/hashicorp/go-hclog"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/command/agent"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
)

Expand Down Expand Up @@ -99,7 +100,7 @@ func (ah *AuthHandler) Run(ctx context.Context, am AuthMethod) {
credCh = make(chan struct{})
}

var renewer *api.Renewer
var renewer *agent.Renewer

for {
select {
Expand Down Expand Up @@ -196,7 +197,7 @@ func (ah *AuthHandler) Run(ctx context.Context, am AuthMethod) {
renewer.Stop()
}

renewer, err = ah.client.NewRenewer(&api.RenewerInput{
renewer, err = agent.NewRenewer(ah.client, &agent.RenewerInput{
Secret: secret,
})
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion command/agent/cache/lease_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/hashicorp/errwrap"
hclog "github.com/hashicorp/go-hclog"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/command/agent"
cachememdb "github.com/hashicorp/vault/command/agent/cache/cachememdb"
"github.com/hashicorp/vault/helper/namespace"
nshelper "github.com/hashicorp/vault/helper/namespace"
Expand Down Expand Up @@ -394,7 +395,7 @@ func (c *LeaseCache) startRenewing(ctx context.Context, index *cachememdb.Index,
client.SetToken(req.Token)
client.SetHeaders(req.Request.Header)

renewer, err := client.NewRenewer(&api.RenewerInput{
renewer, err := agent.NewRenewer(client, &agent.RenewerInput{
Secret: secret,
})
if err != nil {
Expand Down
Loading