a7ada08b3b
* govet cleanup in token store * adding general ttl handling to login requests * consolidating TTL calculation to system view * deprecate LeaseExtend * deprecate LeaseExtend * set the increment to the correct value * move calculateTTL out of SystemView * remove unused value * add back clearing of lease id * implement core ttl in some backends * removing increment and issue time from lease options * adding ttl tests, fixing some compile issue * adding ttl tests * fixing some explicit max TTL logic * fixing up some tests * removing unneeded test * off by one errors... * adding back some logic for bc * adding period to return on renewal * tweaking max ttl capping slightly * use the appropriate precision for ttl calculation * deprecate proto fields instead of delete * addressing feedback * moving TTL handling for backends to core * mongo is a secret backend not auth * adding estimated ttl for backends that also manage the expiration time * set the estimate values before calling the renew request * moving calculate TTL to framework, revert removal of increment and issue time from logical * minor edits * addressing feedback * address more feedback
70 lines
1.5 KiB
Go
70 lines
1.5 KiB
Go
package nomad
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/vault/logical"
|
|
"github.com/hashicorp/vault/logical/framework"
|
|
)
|
|
|
|
const (
|
|
SecretTokenType = "token"
|
|
)
|
|
|
|
func secretToken(b *backend) *framework.Secret {
|
|
return &framework.Secret{
|
|
Type: SecretTokenType,
|
|
Fields: map[string]*framework.FieldSchema{
|
|
"token": &framework.FieldSchema{
|
|
Type: framework.TypeString,
|
|
Description: "Request token",
|
|
},
|
|
},
|
|
|
|
Renew: b.secretTokenRenew,
|
|
Revoke: b.secretTokenRevoke,
|
|
}
|
|
}
|
|
|
|
func (b *backend) secretTokenRenew(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
|
|
lease, err := b.LeaseConfig(ctx, req.Storage)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if lease == nil {
|
|
lease = &configLease{}
|
|
}
|
|
resp := &logical.Response{Secret: req.Secret}
|
|
resp.Secret.TTL = lease.TTL
|
|
resp.Secret.MaxTTL = lease.MaxTTL
|
|
return resp, nil
|
|
}
|
|
|
|
func (b *backend) secretTokenRevoke(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
|
|
c, err := b.client(ctx, req.Storage)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if c == nil {
|
|
return nil, fmt.Errorf("error getting Nomad client")
|
|
}
|
|
|
|
accessorIDRaw, ok := req.Secret.InternalData["accessor_id"]
|
|
if !ok {
|
|
return nil, fmt.Errorf("accessor_id is missing on the lease")
|
|
}
|
|
accessorID, ok := accessorIDRaw.(string)
|
|
if !ok {
|
|
return nil, errors.New("unable to convert accessor_id")
|
|
}
|
|
_, err = c.ACLTokens().Delete(accessorID, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return nil, nil
|
|
}
|