2015-03-13 17:55:54 +00:00
|
|
|
package vault
|
|
|
|
|
|
|
|
import (
|
2018-06-16 22:21:33 +00:00
|
|
|
"bytes"
|
2018-01-08 18:31:38 +00:00
|
|
|
"context"
|
2018-07-11 19:45:09 +00:00
|
|
|
"errors"
|
2016-03-09 21:47:58 +00:00
|
|
|
"fmt"
|
Vault-1403 Switch Expiration Manager to use Fairsharing Backpressure (#1709) (#10932)
* basic pool and start testing
* refactor a bit for testing
* workFunc, start/stop safety, testing
* cleanup function for worker quit, more tests
* redo public/private members
* improve tests, export types, switch uuid package
* fix loop capture bug, cleanup
* cleanup tests
* update worker pool file name, other improvements
* add job manager prototype
* remove remnants
* add functions to wait for job manager and worker pool to stop, other fixes
* test job manager functionality, fix bugs
* encapsulate how jobs are distributed to workers
* make worker job channel read only
* add job interface, more testing, fixes
* set name for dispatcher
* fix test races
* wire up expiration manager most of the way
* dispatcher and job manager constructors don't return errors
* logger now dependency injected
* make some members private, test fcn to get worker pool size
* make GetNumWorkers public
* Update helper/fairshare/jobmanager_test.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* update fairsharing usage, add tests
* make workerpool private
* remove custom worker names
* concurrency improvements
* remove worker pool cleanup function
* remove cleanup func from job manager, remove non blocking stop from fairshare
* update job manager for new constructor
* stop job manager when expiration manager stopped
* unset env var after test
* stop fairshare when started in tests
* stop leaking job manager goroutine
* prototype channel for waking up to assign work
* fix typo/bug and add tests
* improve job manager wake up, fix test typo
* put channel drain back
* better start/pause test for job manager
* comment cleanup
* degrade possible noisy log
* remove closure, clean up context
* improve revocation context timer
* test: reduce number of revocation workers during many tests
* Update vault/expiration.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* feedback tweaks
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
2021-02-17 22:30:27 +00:00
|
|
|
"os"
|
2015-03-13 17:55:54 +00:00
|
|
|
"reflect"
|
2015-03-16 21:59:37 +00:00
|
|
|
"sort"
|
2015-03-13 17:55:54 +00:00
|
|
|
"strings"
|
2017-02-16 18:16:06 +00:00
|
|
|
"sync"
|
2018-07-11 19:45:09 +00:00
|
|
|
"sync/atomic"
|
2015-03-13 17:55:54 +00:00
|
|
|
"testing"
|
|
|
|
"time"
|
2015-03-15 21:53:41 +00:00
|
|
|
|
2020-11-13 18:26:58 +00:00
|
|
|
metrics "github.com/armon/go-metrics"
|
2018-04-03 00:46:59 +00:00
|
|
|
log "github.com/hashicorp/go-hclog"
|
2019-01-09 00:48:57 +00:00
|
|
|
uuid "github.com/hashicorp/go-uuid"
|
Vault-1403 Switch Expiration Manager to use Fairsharing Backpressure (#1709) (#10932)
* basic pool and start testing
* refactor a bit for testing
* workFunc, start/stop safety, testing
* cleanup function for worker quit, more tests
* redo public/private members
* improve tests, export types, switch uuid package
* fix loop capture bug, cleanup
* cleanup tests
* update worker pool file name, other improvements
* add job manager prototype
* remove remnants
* add functions to wait for job manager and worker pool to stop, other fixes
* test job manager functionality, fix bugs
* encapsulate how jobs are distributed to workers
* make worker job channel read only
* add job interface, more testing, fixes
* set name for dispatcher
* fix test races
* wire up expiration manager most of the way
* dispatcher and job manager constructors don't return errors
* logger now dependency injected
* make some members private, test fcn to get worker pool size
* make GetNumWorkers public
* Update helper/fairshare/jobmanager_test.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* update fairsharing usage, add tests
* make workerpool private
* remove custom worker names
* concurrency improvements
* remove worker pool cleanup function
* remove cleanup func from job manager, remove non blocking stop from fairshare
* update job manager for new constructor
* stop job manager when expiration manager stopped
* unset env var after test
* stop fairshare when started in tests
* stop leaking job manager goroutine
* prototype channel for waking up to assign work
* fix typo/bug and add tests
* improve job manager wake up, fix test typo
* put channel drain back
* better start/pause test for job manager
* comment cleanup
* degrade possible noisy log
* remove closure, clean up context
* improve revocation context timer
* test: reduce number of revocation workers during many tests
* Update vault/expiration.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* feedback tweaks
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
2021-02-17 22:30:27 +00:00
|
|
|
"github.com/hashicorp/vault/helper/fairshare"
|
2020-11-13 18:26:58 +00:00
|
|
|
"github.com/hashicorp/vault/helper/metricsutil"
|
2018-09-18 03:03:00 +00:00
|
|
|
"github.com/hashicorp/vault/helper/namespace"
|
2019-04-12 21:54:35 +00:00
|
|
|
"github.com/hashicorp/vault/sdk/framework"
|
2019-04-13 07:44:06 +00:00
|
|
|
"github.com/hashicorp/vault/sdk/helper/logging"
|
|
|
|
"github.com/hashicorp/vault/sdk/logical"
|
2019-04-12 21:54:35 +00:00
|
|
|
"github.com/hashicorp/vault/sdk/physical"
|
|
|
|
"github.com/hashicorp/vault/sdk/physical/inmem"
|
2017-02-16 18:16:06 +00:00
|
|
|
)
|
|
|
|
|
2021-04-08 16:43:39 +00:00
|
|
|
var testImagePull sync.Once
|
2015-03-13 17:55:54 +00:00
|
|
|
|
|
|
|
// mockExpiration returns a mock expiration manager
|
2017-02-16 18:16:06 +00:00
|
|
|
func mockExpiration(t testing.TB) *ExpirationManager {
|
2018-06-03 22:14:51 +00:00
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
return c.expiration
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
|
|
|
|
2017-02-16 18:16:06 +00:00
|
|
|
func mockBackendExpiration(t testing.TB, backend physical.Backend) (*Core, *ExpirationManager) {
|
2018-06-03 22:14:51 +00:00
|
|
|
c, _, _ := TestCoreUnsealedBackend(t, backend)
|
|
|
|
return c, c.expiration
|
2017-02-16 18:16:06 +00:00
|
|
|
}
|
|
|
|
|
2020-11-13 18:26:58 +00:00
|
|
|
func TestExpiration_Metrics(t *testing.T) {
|
|
|
|
var err error
|
|
|
|
|
|
|
|
testCore := TestCore(t)
|
|
|
|
testCore.baseLogger = logger
|
|
|
|
testCore.logger = logger.Named("core")
|
|
|
|
testCoreUnsealed(t, testCore)
|
|
|
|
|
|
|
|
exp := testCore.expiration
|
|
|
|
|
|
|
|
if err := exp.Restore(nil); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set up a count function to calculate number of leases
|
|
|
|
count := 0
|
2021-05-11 20:04:06 +00:00
|
|
|
countFunc := func(_ string) {
|
2020-11-13 18:26:58 +00:00
|
|
|
count++
|
|
|
|
}
|
|
|
|
|
|
|
|
// Scan the storage with the count func set
|
|
|
|
if err = logical.ScanView(namespace.RootContext(nil), exp.idView, countFunc); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that there are no leases to begin with
|
|
|
|
if count != 0 {
|
|
|
|
t.Fatalf("bad: lease count; expected:0 actual:%d", count)
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := 0; i < 50; i++ {
|
|
|
|
le := &leaseEntry{
|
|
|
|
LeaseID: "lease" + fmt.Sprintf("%d", i),
|
|
|
|
Path: "foo/bar/" + fmt.Sprintf("%d", i),
|
|
|
|
namespace: namespace.RootNamespace,
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now().Add(time.Hour),
|
|
|
|
}
|
|
|
|
|
|
|
|
otherNS := &namespace.Namespace{
|
|
|
|
ID: "nsid",
|
|
|
|
Path: "foo/bar",
|
|
|
|
}
|
|
|
|
|
|
|
|
otherNSle := &leaseEntry{
|
|
|
|
LeaseID: "lease" + fmt.Sprintf("%d", i) + "/blah.nsid",
|
|
|
|
Path: "foo/bar/" + fmt.Sprintf("%d", i) + "/blah.nsid",
|
|
|
|
namespace: otherNS,
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now().Add(time.Hour),
|
|
|
|
}
|
|
|
|
|
|
|
|
exp.pendingLock.Lock()
|
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
|
|
|
exp.updatePendingInternal(le)
|
|
|
|
|
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), otherNSle); err != nil {
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
|
|
|
exp.updatePendingInternal(otherNSle)
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := 50; i < 250; i++ {
|
|
|
|
le := &leaseEntry{
|
|
|
|
LeaseID: "lease" + fmt.Sprintf("%d", i+1),
|
|
|
|
Path: "foo/bar/" + fmt.Sprintf("%d", i+1),
|
|
|
|
namespace: namespace.RootNamespace,
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now().Add(2 * time.Hour),
|
|
|
|
}
|
|
|
|
|
|
|
|
exp.pendingLock.Lock()
|
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
|
|
|
exp.updatePendingInternal(le)
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
count = 0
|
|
|
|
if err = logical.ScanView(context.Background(), exp.idView, countFunc); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
var conf metricsutil.TelemetryConstConfig = metricsutil.TelemetryConstConfig{
|
|
|
|
LeaseMetricsEpsilon: time.Hour,
|
|
|
|
NumLeaseMetricsTimeBuckets: 2,
|
|
|
|
LeaseMetricsNameSpaceLabels: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
flattenedResults, err := exp.leaseAggregationMetrics(context.Background(), conf)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if flattenedResults == nil {
|
|
|
|
t.Fatal("lease aggregation returns nil metrics")
|
|
|
|
}
|
|
|
|
|
|
|
|
labelOneHour := metrics.Label{"expiring", time.Now().Add(time.Hour).Round(time.Hour).String()}
|
|
|
|
labelTwoHours := metrics.Label{"expiring", time.Now().Add(2 * time.Hour).Round(time.Hour).String()}
|
|
|
|
nsLabel := metrics.Label{"namespace", "root"}
|
|
|
|
nsLabelNonRoot := metrics.Label{"namespace", "nsid"}
|
|
|
|
|
|
|
|
foundLabelOne := false
|
|
|
|
foundLabelTwo := false
|
|
|
|
foundLabelThree := false
|
|
|
|
|
|
|
|
for _, labelVal := range flattenedResults {
|
|
|
|
retNsLabel := labelVal.Labels[1]
|
|
|
|
retTimeLabel := labelVal.Labels[0]
|
|
|
|
if nsLabel == retNsLabel {
|
|
|
|
if labelVal.Value == 50 {
|
|
|
|
if retTimeLabel == labelOneHour {
|
|
|
|
foundLabelOne = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if labelVal.Value == 200 {
|
|
|
|
if retTimeLabel == labelTwoHours {
|
|
|
|
foundLabelTwo = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if retNsLabel == nsLabelNonRoot {
|
|
|
|
if labelVal.Value == 50 {
|
|
|
|
if retTimeLabel == labelOneHour {
|
|
|
|
foundLabelThree = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !foundLabelOne || !foundLabelTwo || !foundLabelThree {
|
2021-05-11 20:04:06 +00:00
|
|
|
t.Errorf("One of the labels is missing. one: %t, two: %t, three: %t", foundLabelOne, foundLabelTwo, foundLabelThree)
|
2020-11-13 18:26:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// test the same leases while ignoring namespaces so the 2 different namespaces get aggregated
|
|
|
|
conf = metricsutil.TelemetryConstConfig{
|
|
|
|
LeaseMetricsEpsilon: time.Hour,
|
|
|
|
NumLeaseMetricsTimeBuckets: 2,
|
|
|
|
LeaseMetricsNameSpaceLabels: false,
|
|
|
|
}
|
|
|
|
|
|
|
|
flattenedResults, err = exp.leaseAggregationMetrics(context.Background(), conf)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if flattenedResults == nil {
|
|
|
|
t.Fatal("lease aggregation returns nil metrics")
|
|
|
|
}
|
|
|
|
|
|
|
|
foundLabelOne = false
|
|
|
|
foundLabelTwo = false
|
|
|
|
|
|
|
|
for _, labelVal := range flattenedResults {
|
|
|
|
if len(labelVal.Labels) != 1 {
|
|
|
|
t.Errorf("Namespace label is returned when explicitly not requested.")
|
|
|
|
}
|
|
|
|
retTimeLabel := labelVal.Labels[0]
|
|
|
|
if labelVal.Value == 100 {
|
|
|
|
if retTimeLabel == labelOneHour {
|
|
|
|
foundLabelOne = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if labelVal.Value == 200 {
|
|
|
|
if retTimeLabel == labelTwoHours {
|
|
|
|
foundLabelTwo = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !foundLabelOne || !foundLabelTwo {
|
|
|
|
t.Errorf("One of the labels is missing")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-11 20:04:06 +00:00
|
|
|
func TestExpiration_TotalLeaseCount(t *testing.T) {
|
|
|
|
// Quotas and internal lease count tracker are coupled, so this is a proxy
|
|
|
|
// for testing the total lease count quota
|
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
exp := c.expiration
|
|
|
|
|
|
|
|
expectedCount := 0
|
|
|
|
otherNS := &namespace.Namespace{
|
|
|
|
ID: "nsid",
|
|
|
|
Path: "foo/bar",
|
|
|
|
}
|
|
|
|
for i := 0; i < 50; i++ {
|
|
|
|
le := &leaseEntry{
|
|
|
|
LeaseID: "lease" + fmt.Sprintf("%d", i),
|
|
|
|
Path: "foo/bar/" + fmt.Sprintf("%d", i),
|
|
|
|
namespace: namespace.RootNamespace,
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now().Add(time.Hour),
|
|
|
|
}
|
|
|
|
|
|
|
|
otherNSle := &leaseEntry{
|
|
|
|
LeaseID: "lease" + fmt.Sprintf("%d", i) + "/blah.nsid",
|
|
|
|
Path: "foo/bar/" + fmt.Sprintf("%d", i) + "/blah.nsid",
|
|
|
|
namespace: otherNS,
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now().Add(time.Hour),
|
|
|
|
}
|
|
|
|
|
|
|
|
exp.pendingLock.Lock()
|
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
t.Fatalf("error persisting irrevocable entry: %v", err)
|
|
|
|
}
|
|
|
|
exp.updatePendingInternal(le)
|
|
|
|
expectedCount++
|
|
|
|
|
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), otherNSle); err != nil {
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
t.Fatalf("error persisting irrevocable entry: %v", err)
|
|
|
|
}
|
|
|
|
exp.updatePendingInternal(otherNSle)
|
|
|
|
expectedCount++
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
// add some irrevocable leases to each count to ensure they are counted too
|
|
|
|
// note: irrevocable leases almost certainly have an expire time set in the
|
|
|
|
// past, but for this exercise it should be fine to set it to whatever
|
|
|
|
for i := 50; i < 60; i++ {
|
|
|
|
le := &leaseEntry{
|
|
|
|
LeaseID: "lease" + fmt.Sprintf("%d", i+1),
|
|
|
|
Path: "foo/bar/" + fmt.Sprintf("%d", i+1),
|
|
|
|
namespace: namespace.RootNamespace,
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now(),
|
|
|
|
RevokeErr: "some err message",
|
|
|
|
}
|
|
|
|
|
|
|
|
otherNSle := &leaseEntry{
|
|
|
|
LeaseID: "lease" + fmt.Sprintf("%d", i+1) + "/blah.nsid",
|
|
|
|
Path: "foo/bar/" + fmt.Sprintf("%d", i+1) + "/blah.nsid",
|
|
|
|
namespace: otherNS,
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now(),
|
|
|
|
RevokeErr: "some err message",
|
|
|
|
}
|
|
|
|
|
|
|
|
exp.pendingLock.Lock()
|
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
t.Fatalf("error persisting irrevocable entry: %v", err)
|
|
|
|
}
|
|
|
|
exp.updatePendingInternal(le)
|
|
|
|
expectedCount++
|
|
|
|
|
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), otherNSle); err != nil {
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
t.Fatalf("error persisting irrevocable entry: %v", err)
|
|
|
|
}
|
|
|
|
exp.updatePendingInternal(otherNSle)
|
|
|
|
expectedCount++
|
|
|
|
exp.pendingLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
exp.pendingLock.RLock()
|
|
|
|
count := exp.leaseCount
|
|
|
|
exp.pendingLock.RUnlock()
|
|
|
|
|
|
|
|
if count != expectedCount {
|
|
|
|
t.Errorf("bad lease count. expected %d, got %d", expectedCount, count)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-02 20:54:03 +00:00
|
|
|
func TestExpiration_Tidy(t *testing.T) {
|
2017-05-02 21:11:35 +00:00
|
|
|
var err error
|
|
|
|
|
2018-06-16 22:21:33 +00:00
|
|
|
// We use this later for tidy testing where we need to check the output
|
|
|
|
logOut := new(bytes.Buffer)
|
|
|
|
logger := log.New(&log.LoggerOptions{
|
|
|
|
Output: logOut,
|
|
|
|
})
|
2018-07-06 21:01:02 +00:00
|
|
|
|
|
|
|
testCore := TestCore(t)
|
2018-08-24 16:47:56 +00:00
|
|
|
testCore.baseLogger = logger
|
|
|
|
testCore.logger = logger.Named("core")
|
2018-07-06 21:01:02 +00:00
|
|
|
testCoreUnsealed(t, testCore)
|
|
|
|
|
|
|
|
exp := testCore.expiration
|
2018-06-16 22:21:33 +00:00
|
|
|
|
2017-09-11 18:49:08 +00:00
|
|
|
if err := exp.Restore(nil); err != nil {
|
2017-09-05 15:09:00 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2017-05-02 20:54:03 +00:00
|
|
|
|
|
|
|
// Set up a count function to calculate number of leases
|
|
|
|
count := 0
|
|
|
|
countFunc := func(leaseID string) {
|
|
|
|
count++
|
|
|
|
}
|
|
|
|
|
|
|
|
// Scan the storage with the count func set
|
2018-11-05 16:11:32 +00:00
|
|
|
if err = logical.ScanView(namespace.RootContext(nil), exp.idView, countFunc); err != nil {
|
2017-05-02 20:54:03 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that there are no leases to begin with
|
|
|
|
if count != 0 {
|
|
|
|
t.Fatalf("bad: lease count; expected:0 actual:%d", count)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a lease entry without a client token in it
|
|
|
|
le := &leaseEntry{
|
2018-09-18 03:03:00 +00:00
|
|
|
LeaseID: "lease/with/no/client/token",
|
|
|
|
Path: "foo/bar",
|
2018-11-05 16:11:32 +00:00
|
|
|
namespace: namespace.RootNamespace,
|
2017-05-02 20:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Persist the invalid lease entry
|
2018-11-05 16:11:32 +00:00
|
|
|
if err = exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
2017-05-02 20:54:03 +00:00
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
count = 0
|
2018-01-19 06:44:44 +00:00
|
|
|
if err = logical.ScanView(context.Background(), exp.idView, countFunc); err != nil {
|
2017-05-02 20:54:03 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the storage was successful and that the count of leases is
|
|
|
|
// now 1
|
|
|
|
if count != 1 {
|
|
|
|
t.Fatalf("bad: lease count; expected:1 actual:%d", count)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Run the tidy operation
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.Tidy(namespace.RootContext(nil))
|
2017-05-02 21:56:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2017-05-02 20:54:03 +00:00
|
|
|
|
|
|
|
count = 0
|
2018-01-19 06:44:44 +00:00
|
|
|
if err := logical.ScanView(context.Background(), exp.idView, countFunc); err != nil {
|
2017-05-02 20:54:03 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Post the tidy operation, the invalid lease entry should have been gone
|
|
|
|
if count != 0 {
|
|
|
|
t.Fatalf("bad: lease count; expected:0 actual:%d", count)
|
|
|
|
}
|
2017-05-02 21:11:35 +00:00
|
|
|
|
|
|
|
// Set a revoked/invalid token in the lease entry
|
|
|
|
le.ClientToken = "invalidtoken"
|
|
|
|
|
|
|
|
// Persist the invalid lease entry
|
2018-11-05 16:11:32 +00:00
|
|
|
if err = exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
2017-05-02 21:11:35 +00:00
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
count = 0
|
2018-01-19 06:44:44 +00:00
|
|
|
if err = logical.ScanView(context.Background(), exp.idView, countFunc); err != nil {
|
2017-05-02 21:11:35 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the storage was successful and that the count of leases is
|
|
|
|
// now 1
|
|
|
|
if count != 1 {
|
|
|
|
t.Fatalf("bad: lease count; expected:1 actual:%d", count)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Run the tidy operation
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.Tidy(namespace.RootContext(nil))
|
2017-05-02 21:56:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2017-05-02 21:11:35 +00:00
|
|
|
|
|
|
|
count = 0
|
2018-01-19 06:44:44 +00:00
|
|
|
if err = logical.ScanView(context.Background(), exp.idView, countFunc); err != nil {
|
2017-05-02 21:11:35 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2017-05-02 21:15:26 +00:00
|
|
|
|
2017-05-02 21:56:15 +00:00
|
|
|
// Post the tidy operation, the invalid lease entry should have been gone
|
|
|
|
if count != 0 {
|
|
|
|
t.Fatalf("bad: lease count; expected:0 actual:%d", count)
|
|
|
|
}
|
|
|
|
|
2017-05-02 21:15:26 +00:00
|
|
|
// Attach an invalid token with 2 leases
|
2018-11-05 16:11:32 +00:00
|
|
|
if err = exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
2017-05-02 21:15:26 +00:00
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
le.LeaseID = "another/invalid/lease"
|
2018-08-02 01:39:39 +00:00
|
|
|
if err = exp.persistEntry(context.Background(), le); err != nil {
|
2017-05-02 21:15:26 +00:00
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Run the tidy operation
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.Tidy(namespace.RootContext(nil))
|
2017-05-02 21:56:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2017-05-02 21:15:26 +00:00
|
|
|
|
|
|
|
count = 0
|
2018-01-19 06:44:44 +00:00
|
|
|
if err = logical.ScanView(context.Background(), exp.idView, countFunc); err != nil {
|
2017-05-02 21:15:26 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2017-05-02 21:56:15 +00:00
|
|
|
|
|
|
|
// Post the tidy operation, the invalid lease entry should have been gone
|
|
|
|
if count != 0 {
|
|
|
|
t.Fatalf("bad: lease count; expected:0 actual:%d", count)
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := 0; i < 1000; i++ {
|
|
|
|
req := &logical.Request{
|
2017-05-02 22:06:59 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "invalid/lease/" + fmt.Sprintf("%d", i+1),
|
|
|
|
ClientToken: "invalidtoken",
|
2017-05-02 21:56:15 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "invalidtoken", NamespaceID: "root"})
|
2017-05-02 21:56:15 +00:00
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 100 * time.Millisecond,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"test_key": "test_value",
|
|
|
|
},
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
_, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2017-05-02 21:56:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
count = 0
|
2018-01-19 06:44:44 +00:00
|
|
|
if err = logical.ScanView(context.Background(), exp.idView, countFunc); err != nil {
|
2017-05-02 21:56:15 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that there are 1000 leases now
|
|
|
|
if count != 1000 {
|
|
|
|
t.Fatalf("bad: lease count; expected:1000 actual:%d", count)
|
|
|
|
}
|
|
|
|
|
|
|
|
errCh1 := make(chan error)
|
|
|
|
errCh2 := make(chan error)
|
|
|
|
|
|
|
|
// Initiate tidy of the above 1000 invalid leases in quick succession. Only
|
|
|
|
// one tidy operation can be in flight at any time. One of these requests
|
|
|
|
// should error out.
|
|
|
|
go func() {
|
2018-11-05 16:11:32 +00:00
|
|
|
errCh1 <- exp.Tidy(namespace.RootContext(nil))
|
2017-05-02 21:56:15 +00:00
|
|
|
}()
|
|
|
|
|
|
|
|
go func() {
|
2018-11-05 16:11:32 +00:00
|
|
|
errCh2 <- exp.Tidy(namespace.RootContext(nil))
|
2017-05-02 21:56:15 +00:00
|
|
|
}()
|
|
|
|
|
|
|
|
var err1, err2 error
|
|
|
|
|
|
|
|
for i := 0; i < 2; i++ {
|
|
|
|
select {
|
|
|
|
case err1 = <-errCh1:
|
|
|
|
case err2 = <-errCh2:
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-16 22:21:33 +00:00
|
|
|
if err1 != nil || err2 != nil {
|
|
|
|
t.Fatalf("got an error: err1: %v; err2: %v", err1, err2)
|
|
|
|
}
|
|
|
|
if !strings.Contains(logOut.String(), "tidy operation on leases is already in progress") {
|
|
|
|
t.Fatalf("expected to see a warning saying operation in progress, output is %s", logOut.String())
|
2017-05-02 21:56:15 +00:00
|
|
|
}
|
2017-05-02 22:12:03 +00:00
|
|
|
|
2018-01-19 06:44:44 +00:00
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
2017-07-04 17:58:28 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2017-05-02 22:12:03 +00:00
|
|
|
le.ClientToken = root.ID
|
|
|
|
|
|
|
|
// Attach a valid token with the leases
|
2018-11-05 16:11:32 +00:00
|
|
|
if err = exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
2017-05-02 22:12:03 +00:00
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
|
|
|
|
2017-05-04 16:41:15 +00:00
|
|
|
// Run the tidy operation
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.Tidy(namespace.RootContext(nil))
|
2017-05-04 16:41:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
2017-05-02 22:12:03 +00:00
|
|
|
count = 0
|
2018-01-19 06:44:44 +00:00
|
|
|
if err = logical.ScanView(context.Background(), exp.idView, countFunc); err != nil {
|
2017-05-02 22:12:03 +00:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Post the tidy operation, the valid lease entry should not get affected
|
|
|
|
if count != 1 {
|
|
|
|
t.Fatalf("bad: lease count; expected:1 actual:%d", count)
|
|
|
|
}
|
2017-05-02 20:54:03 +00:00
|
|
|
}
|
|
|
|
|
2017-08-03 17:24:27 +00:00
|
|
|
// To avoid pulling in deps for all users of the package, don't leave these
|
|
|
|
// uncommented in the public tree
|
|
|
|
/*
|
2017-02-16 18:16:06 +00:00
|
|
|
func BenchmarkExpiration_Restore_Etcd(b *testing.B) {
|
|
|
|
addr := os.Getenv("PHYSICAL_BACKEND_BENCHMARK_ADDR")
|
|
|
|
randPath := fmt.Sprintf("vault-%d/", time.Now().Unix())
|
|
|
|
|
2018-04-03 00:46:59 +00:00
|
|
|
logger := logging.NewVaultLogger(log.Trace)
|
2017-08-03 17:24:27 +00:00
|
|
|
physicalBackend, err := physEtcd.NewEtcdBackend(map[string]string{
|
2017-02-16 18:16:06 +00:00
|
|
|
"address": addr,
|
|
|
|
"path": randPath,
|
|
|
|
"max_parallel": "256",
|
2017-08-03 17:24:27 +00:00
|
|
|
}, logger)
|
2017-02-16 18:16:06 +00:00
|
|
|
if err != nil {
|
|
|
|
b.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
benchmarkExpirationBackend(b, physicalBackend, 10000) // 10,000 leases
|
|
|
|
}
|
|
|
|
|
|
|
|
func BenchmarkExpiration_Restore_Consul(b *testing.B) {
|
|
|
|
addr := os.Getenv("PHYSICAL_BACKEND_BENCHMARK_ADDR")
|
|
|
|
randPath := fmt.Sprintf("vault-%d/", time.Now().Unix())
|
|
|
|
|
2018-04-03 00:46:59 +00:00
|
|
|
logger := logging.NewVaultLogger(log.Trace)
|
2017-08-03 17:24:27 +00:00
|
|
|
physicalBackend, err := physConsul.NewConsulBackend(map[string]string{
|
2017-02-16 18:16:06 +00:00
|
|
|
"address": addr,
|
|
|
|
"path": randPath,
|
|
|
|
"max_parallel": "256",
|
2017-08-03 17:24:27 +00:00
|
|
|
}, logger)
|
2017-02-16 18:16:06 +00:00
|
|
|
if err != nil {
|
|
|
|
b.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
benchmarkExpirationBackend(b, physicalBackend, 10000) // 10,000 leases
|
|
|
|
}
|
2017-08-03 17:24:27 +00:00
|
|
|
*/
|
2017-02-16 18:16:06 +00:00
|
|
|
|
|
|
|
func BenchmarkExpiration_Restore_InMem(b *testing.B) {
|
2018-04-03 00:46:59 +00:00
|
|
|
logger := logging.NewVaultLogger(log.Trace)
|
2017-08-03 17:24:27 +00:00
|
|
|
inm, err := inmem.NewInmem(nil, logger)
|
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
|
|
|
benchmarkExpirationBackend(b, inm, 100000) // 100,000 Leases
|
2017-02-16 18:16:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func benchmarkExpirationBackend(b *testing.B, physicalBackend physical.Backend, numLeases int) {
|
2018-06-03 22:14:51 +00:00
|
|
|
c, _, _ := TestCoreUnsealedBackend(b, physicalBackend)
|
|
|
|
exp := c.expiration
|
2017-02-16 18:16:06 +00:00
|
|
|
noop := &NoopBackend{}
|
|
|
|
view := NewBarrierView(c.barrier, "logical/")
|
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
2017-02-16 18:16:06 +00:00
|
|
|
|
|
|
|
// Register fake leases
|
|
|
|
for i := 0; i < numLeases; i++ {
|
|
|
|
pathUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
req := &logical.Request{
|
2017-09-05 15:09:00 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/" + pathUUID,
|
|
|
|
ClientToken: "root",
|
2017-02-16 18:16:06 +00:00
|
|
|
}
|
2021-06-10 00:28:41 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "root", NamespaceID: "root"})
|
2017-02-16 18:16:06 +00:00
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 400 * time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
2021-06-10 00:28:41 +00:00
|
|
|
_, err = exp.Register(namespace.RootContext(nil), req, resp)
|
2017-02-16 18:16:06 +00:00
|
|
|
if err != nil {
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Stop everything
|
|
|
|
err = exp.Stop()
|
|
|
|
if err != nil {
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
2017-09-11 18:49:08 +00:00
|
|
|
err = exp.Restore(nil)
|
2017-02-16 18:16:06 +00:00
|
|
|
// Restore
|
|
|
|
if err != nil {
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
b.StopTimer()
|
|
|
|
}
|
|
|
|
|
2021-06-10 00:28:41 +00:00
|
|
|
func BenchmarkExpiration_Create_Leases(b *testing.B) {
|
|
|
|
logger := logging.NewVaultLogger(log.Trace)
|
|
|
|
inm, err := inmem.NewInmem(nil, logger)
|
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
c, _, _ := TestCoreUnsealedBackend(b, inm)
|
|
|
|
exp := c.expiration
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
view := NewBarrierView(c.barrier, "logical/")
|
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
ClientToken: "root",
|
|
|
|
}
|
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "root", NamespaceID: "root"})
|
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 400 * time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
req.Path = fmt.Sprintf("prod/aws/%d", i)
|
|
|
|
_, err = exp.Register(namespace.RootContext(nil), req, resp)
|
|
|
|
if err != nil {
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-16 22:11:35 +00:00
|
|
|
func TestExpiration_Restore(t *testing.T) {
|
2021-05-06 14:19:53 +00:00
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
exp := c.expiration
|
2015-03-16 22:11:35 +00:00
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-03-16 22:11:35 +00:00
|
|
|
|
|
|
|
paths := []string{
|
|
|
|
"prod/aws/foo",
|
|
|
|
"prod/aws/sub/bar",
|
|
|
|
"prod/aws/zip",
|
|
|
|
}
|
|
|
|
for _, path := range paths {
|
|
|
|
req := &logical.Request{
|
2017-05-04 16:41:15 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: path,
|
|
|
|
ClientToken: "foobar",
|
2015-03-16 22:11:35 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
2015-03-16 22:11:35 +00:00
|
|
|
resp := &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2020-07-29 15:13:47 +00:00
|
|
|
TTL: time.Second,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 22:11:35 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
_, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2015-03-16 22:11:35 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-21 17:41:03 +00:00
|
|
|
if exp.leaseCount != len(paths) {
|
|
|
|
t.Fatalf("expected %v leases, got %v", len(paths), exp.leaseCount)
|
|
|
|
}
|
|
|
|
|
2015-03-16 22:11:35 +00:00
|
|
|
// Stop everything
|
2021-05-06 14:19:53 +00:00
|
|
|
err = c.stopExpiration()
|
2015-03-16 22:11:35 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2020-05-21 17:41:03 +00:00
|
|
|
if exp.leaseCount != 0 {
|
|
|
|
t.Fatalf("expected %v leases, got %v", 0, exp.leaseCount)
|
|
|
|
}
|
|
|
|
|
2015-03-16 22:11:35 +00:00
|
|
|
// Restore
|
2017-09-11 18:49:08 +00:00
|
|
|
err = exp.Restore(nil)
|
2015-03-16 22:11:35 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2020-05-21 17:41:03 +00:00
|
|
|
// Would like to test here, but this is a race with the expiration of the leases.
|
|
|
|
|
2015-03-16 22:11:35 +00:00
|
|
|
// Ensure all are reaped
|
|
|
|
start := time.Now()
|
|
|
|
for time.Now().Sub(start) < time.Second {
|
2015-04-29 02:17:45 +00:00
|
|
|
noop.Lock()
|
|
|
|
less := len(noop.Requests) < 3
|
|
|
|
noop.Unlock()
|
|
|
|
|
|
|
|
if less {
|
2015-03-16 22:11:35 +00:00
|
|
|
time.Sleep(5 * time.Millisecond)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
break
|
|
|
|
}
|
|
|
|
for _, req := range noop.Requests {
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
}
|
2020-05-21 17:41:03 +00:00
|
|
|
|
|
|
|
if exp.leaseCount != 0 {
|
|
|
|
t.Fatalf("expected %v leases, got %v", 0, exp.leaseCount)
|
|
|
|
}
|
2015-03-16 22:11:35 +00:00
|
|
|
}
|
|
|
|
|
2015-03-13 17:55:54 +00:00
|
|
|
func TestExpiration_Register(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
2015-03-15 21:53:41 +00:00
|
|
|
req := &logical.Request{
|
2017-05-04 16:41:15 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: "foobar",
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
2015-03-15 21:53:41 +00:00
|
|
|
resp := &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Hour,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-13 17:55:54 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
id, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2015-03-13 17:55:54 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !strings.HasPrefix(id, req.Path) {
|
|
|
|
t.Fatalf("bad: %s", id)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(id) <= len(req.Path) {
|
|
|
|
t.Fatalf("bad: %s", id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-23 18:46:22 +00:00
|
|
|
func TestExpiration_Register_BatchToken(t *testing.T) {
|
2021-04-16 21:03:22 +00:00
|
|
|
c, _, rootToken := TestCoreUnsealed(t)
|
|
|
|
exp := c.expiration
|
2020-09-23 18:46:22 +00:00
|
|
|
noop := &NoopBackend{
|
|
|
|
RequestHandler: func(ctx context.Context, req *logical.Request) (*logical.Response, error) {
|
|
|
|
resp := &logical.Response{Secret: req.Secret}
|
|
|
|
resp.Secret.TTL = time.Hour
|
|
|
|
return resp, nil
|
|
|
|
},
|
|
|
|
}
|
2021-04-16 21:03:22 +00:00
|
|
|
{
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2020-09-23 18:46:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
te := &logical.TokenEntry{
|
|
|
|
Type: logical.TokenTypeBatch,
|
|
|
|
TTL: 1 * time.Second,
|
|
|
|
NamespaceID: "root",
|
|
|
|
CreationTime: time.Now().Unix(),
|
2021-04-16 21:03:22 +00:00
|
|
|
Parent: rootToken,
|
2020-09-23 18:46:22 +00:00
|
|
|
}
|
|
|
|
|
2021-04-16 21:03:22 +00:00
|
|
|
err := exp.tokenStore.create(context.Background(), te)
|
2020-09-23 18:46:22 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: te.ID,
|
|
|
|
}
|
|
|
|
req.SetTokenEntry(te)
|
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: time.Hour,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
leaseID, err := exp.Register(namespace.RootContext(nil), req, resp)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err = exp.Renew(namespace.RootContext(nil), leaseID, time.Minute)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
start := time.Now()
|
|
|
|
reqID := 0
|
|
|
|
for {
|
|
|
|
if time.Now().Sub(start) > 10*time.Second {
|
|
|
|
t.Fatal("didn't revoke lease")
|
|
|
|
}
|
|
|
|
req = nil
|
|
|
|
|
|
|
|
noop.Lock()
|
|
|
|
if len(noop.Requests) > reqID {
|
|
|
|
req = noop.Requests[reqID]
|
|
|
|
reqID++
|
|
|
|
}
|
|
|
|
noop.Unlock()
|
|
|
|
if req == nil || req.Operation == logical.RenewOperation {
|
|
|
|
time.Sleep(5 * time.Millisecond)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
|
|
|
|
break
|
|
|
|
}
|
2021-04-20 18:55:10 +00:00
|
|
|
|
|
|
|
deadline := time.Now().Add(5 * time.Second)
|
|
|
|
var idEnts []string
|
|
|
|
for time.Now().Before(deadline) {
|
|
|
|
idEnts, err = exp.tokenView.List(context.Background(), "")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(idEnts) == 0 {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
time.Sleep(time.Second)
|
2021-04-16 21:03:22 +00:00
|
|
|
}
|
2021-04-20 18:55:10 +00:00
|
|
|
t.Fatalf("expected no entries in sys/expire/token, got: %v", idEnts)
|
2020-09-23 18:46:22 +00:00
|
|
|
}
|
|
|
|
|
2015-04-03 00:45:42 +00:00
|
|
|
func TestExpiration_RegisterAuth(t *testing.T) {
|
2015-03-24 01:11:15 +00:00
|
|
|
exp := mockExpiration(t)
|
2020-09-23 18:46:22 +00:00
|
|
|
|
2018-01-19 06:44:44 +00:00
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
2015-03-24 01:11:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-04-03 00:45:42 +00:00
|
|
|
auth := &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Hour,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-24 01:11:15 +00:00
|
|
|
}
|
|
|
|
|
2018-09-18 03:03:00 +00:00
|
|
|
te := &logical.TokenEntry{
|
|
|
|
Path: "auth/github/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.RegisterAuth(namespace.RootContext(nil), te, auth)
|
2015-03-24 01:11:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
2017-05-12 17:52:33 +00:00
|
|
|
|
2018-09-18 03:03:00 +00:00
|
|
|
te = &logical.TokenEntry{
|
|
|
|
Path: "auth/github/../login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.RegisterAuth(namespace.RootContext(nil), te, auth)
|
2017-05-12 17:52:33 +00:00
|
|
|
if err == nil {
|
|
|
|
t.Fatal("expected error")
|
|
|
|
}
|
2015-03-24 01:11:15 +00:00
|
|
|
}
|
|
|
|
|
2015-04-08 22:43:26 +00:00
|
|
|
func TestExpiration_RegisterAuth_NoLease(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
2018-01-19 06:44:44 +00:00
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
2015-04-08 22:43:26 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
auth := &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
2021-05-18 21:55:38 +00:00
|
|
|
Policies: []string{"root"},
|
2015-04-08 22:43:26 +00:00
|
|
|
}
|
|
|
|
|
2018-09-18 03:03:00 +00:00
|
|
|
te := &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/github/login",
|
2019-11-05 21:11:13 +00:00
|
|
|
Policies: []string{"root"},
|
2018-09-18 03:03:00 +00:00
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.RegisterAuth(namespace.RootContext(nil), te, auth)
|
2015-04-08 22:43:26 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Should not be able to renew, no expiration
|
2018-09-18 03:03:00 +00:00
|
|
|
te = &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/github/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err := exp.RenewToken(namespace.RootContext(nil), &logical.Request{}, te, 0)
|
2018-10-15 16:56:24 +00:00
|
|
|
if err != nil && (err != logical.ErrInvalidRequest || (resp != nil && resp.IsError() && resp.Error().Error() != "lease is not renewable")) {
|
2016-07-08 23:01:36 +00:00
|
|
|
t.Fatalf("bad: err:%v resp:%#v", err, resp)
|
2016-07-08 14:34:49 +00:00
|
|
|
}
|
2016-07-06 20:42:34 +00:00
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected a response")
|
|
|
|
}
|
2015-04-08 22:43:26 +00:00
|
|
|
|
|
|
|
// Wait and check token is not invalidated
|
|
|
|
time.Sleep(20 * time.Millisecond)
|
|
|
|
|
|
|
|
// Verify token does not get revoked
|
2018-11-05 16:11:32 +00:00
|
|
|
out, err := exp.tokenStore.Lookup(namespace.RootContext(nil), root.ID)
|
2015-04-08 22:43:26 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if out == nil {
|
|
|
|
t.Fatalf("missing token")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-05 21:11:13 +00:00
|
|
|
// Tests both the expiration function and the core function
|
|
|
|
func TestExpiration_RegisterAuth_NoTTL(t *testing.T) {
|
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
exp := c.expiration
|
|
|
|
ctx := namespace.RootContext(nil)
|
|
|
|
|
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
auth := &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
|
|
|
TokenPolicies: []string{"root"},
|
|
|
|
}
|
|
|
|
|
|
|
|
// First on core
|
|
|
|
err = c.RegisterAuth(ctx, 0, "auth/github/login", auth)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
auth.TokenPolicies[0] = "default"
|
|
|
|
err = c.RegisterAuth(ctx, 0, "auth/github/login", auth)
|
|
|
|
if err == nil {
|
|
|
|
t.Fatal("expected error")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now expiration
|
|
|
|
// Should work, root token with zero TTL
|
|
|
|
te := &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/github/login",
|
|
|
|
Policies: []string{"root"},
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
|
|
|
err = exp.RegisterAuth(ctx, te, auth)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Test non-root token with zero TTL
|
|
|
|
te.Policies = []string{"default"}
|
|
|
|
err = exp.RegisterAuth(ctx, te, auth)
|
|
|
|
if err == nil {
|
|
|
|
t.Fatal("expected error")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-16 21:59:37 +00:00
|
|
|
func TestExpiration_Revoke(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-03-16 21:59:37 +00:00
|
|
|
|
|
|
|
req := &logical.Request{
|
2017-05-04 16:41:15 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: "foobar",
|
2015-03-16 21:59:37 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
2015-03-16 21:59:37 +00:00
|
|
|
resp := &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Hour,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 21:59:37 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
id, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2015-03-16 21:59:37 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
if err := exp.Revoke(namespace.RootContext(nil), id); err != nil {
|
2015-03-16 21:59:37 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
req = noop.Requests[0]
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_RevokeOnExpire(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-03-16 21:59:37 +00:00
|
|
|
|
|
|
|
req := &logical.Request{
|
2017-05-04 16:41:15 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: "foobar",
|
2015-03-16 21:59:37 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
2015-03-16 21:59:37 +00:00
|
|
|
resp := &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: 20 * time.Millisecond,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 21:59:37 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
_, err = exp.Register(namespace.RootContext(nil), req, resp)
|
2015-03-16 21:59:37 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
start := time.Now()
|
|
|
|
for time.Now().Sub(start) < time.Second {
|
2015-04-29 02:17:45 +00:00
|
|
|
req = nil
|
|
|
|
|
|
|
|
noop.Lock()
|
|
|
|
if len(noop.Requests) > 0 {
|
|
|
|
req = noop.Requests[0]
|
|
|
|
}
|
|
|
|
noop.Unlock()
|
|
|
|
if req == nil {
|
2015-03-16 21:59:37 +00:00
|
|
|
time.Sleep(5 * time.Millisecond)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
2015-04-29 02:17:45 +00:00
|
|
|
|
2015-03-16 21:59:37 +00:00
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_RevokePrefix(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-03-16 21:59:37 +00:00
|
|
|
|
|
|
|
paths := []string{
|
|
|
|
"prod/aws/foo",
|
|
|
|
"prod/aws/sub/bar",
|
|
|
|
"prod/aws/zip",
|
|
|
|
}
|
|
|
|
for _, path := range paths {
|
|
|
|
req := &logical.Request{
|
2017-05-04 16:41:15 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: path,
|
|
|
|
ClientToken: "foobar",
|
2015-03-16 21:59:37 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
2015-03-16 21:59:37 +00:00
|
|
|
resp := &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2020-07-29 15:13:47 +00:00
|
|
|
TTL: time.Second,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 21:59:37 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
_, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2015-03-16 21:59:37 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Should nuke all the keys
|
2018-11-05 16:11:32 +00:00
|
|
|
if err := exp.RevokePrefix(namespace.RootContext(nil), "prod/aws/", true); err != nil {
|
2015-03-16 21:59:37 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(noop.Requests) != 3 {
|
2015-04-10 21:48:08 +00:00
|
|
|
t.Fatalf("Bad: %v", noop.Requests)
|
|
|
|
}
|
|
|
|
for _, req := range noop.Requests {
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
expect := []string{
|
|
|
|
"foo",
|
|
|
|
"sub/bar",
|
|
|
|
"zip",
|
|
|
|
}
|
|
|
|
sort.Strings(noop.Paths)
|
|
|
|
sort.Strings(expect)
|
|
|
|
if !reflect.DeepEqual(noop.Paths, expect) {
|
|
|
|
t.Fatalf("bad: %v", noop.Paths)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_RevokeByToken(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-04-10 21:48:08 +00:00
|
|
|
|
|
|
|
paths := []string{
|
|
|
|
"prod/aws/foo",
|
|
|
|
"prod/aws/sub/bar",
|
|
|
|
"prod/aws/zip",
|
|
|
|
}
|
|
|
|
for _, path := range paths {
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: path,
|
|
|
|
ClientToken: "foobarbaz",
|
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobarbaz", NamespaceID: "root"})
|
2015-04-10 21:48:08 +00:00
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2020-07-29 15:13:47 +00:00
|
|
|
TTL: time.Second,
|
2015-04-10 21:48:08 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
_, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2015-04-10 21:48:08 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Should nuke all the keys
|
2018-06-08 21:24:27 +00:00
|
|
|
te := &logical.TokenEntry{
|
2018-09-18 03:03:00 +00:00
|
|
|
ID: "foobarbaz",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
2016-03-31 19:10:25 +00:00
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
if err := exp.RevokeByToken(namespace.RootContext(nil), te); err != nil {
|
2015-04-10 21:48:08 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2018-05-10 19:50:02 +00:00
|
|
|
time.Sleep(300 * time.Millisecond)
|
|
|
|
|
|
|
|
noop.Lock()
|
|
|
|
defer noop.Unlock()
|
|
|
|
|
|
|
|
if len(noop.Requests) != 3 {
|
2021-05-11 20:04:06 +00:00
|
|
|
t.Fatalf("Bad: %#v", noop.Requests)
|
2018-05-10 19:50:02 +00:00
|
|
|
}
|
|
|
|
for _, req := range noop.Requests {
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
expect := []string{
|
|
|
|
"foo",
|
|
|
|
"sub/bar",
|
|
|
|
"zip",
|
|
|
|
}
|
|
|
|
sort.Strings(noop.Paths)
|
|
|
|
sort.Strings(expect)
|
|
|
|
if !reflect.DeepEqual(noop.Paths, expect) {
|
|
|
|
t.Fatalf("bad: %v", noop.Paths)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_RevokeByToken_Blocking(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
// Request handle with a timeout context that simulates blocking lease revocation.
|
|
|
|
noop.RequestHandler = func(ctx context.Context, req *logical.Request) (*logical.Response, error) {
|
|
|
|
ctx, cancel := context.WithTimeout(ctx, 200*time.Millisecond)
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
|
|
|
return noop.Response, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2018-05-10 19:50:02 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
paths := []string{
|
|
|
|
"prod/aws/foo",
|
|
|
|
"prod/aws/sub/bar",
|
|
|
|
"prod/aws/zip",
|
|
|
|
}
|
|
|
|
for _, path := range paths {
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: path,
|
|
|
|
ClientToken: "foobarbaz",
|
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobarbaz", NamespaceID: "root"})
|
2018-05-10 19:50:02 +00:00
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 1 * time.Minute,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
_, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2018-05-10 19:50:02 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Should nuke all the keys
|
2018-06-08 21:24:27 +00:00
|
|
|
te := &logical.TokenEntry{
|
2018-09-18 03:03:00 +00:00
|
|
|
ID: "foobarbaz",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
2018-05-10 19:50:02 +00:00
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
if err := exp.RevokeByToken(namespace.RootContext(nil), te); err != nil {
|
2018-05-10 19:50:02 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Lock and check that no requests has gone through yet
|
|
|
|
noop.Lock()
|
|
|
|
if len(noop.Requests) != 0 {
|
|
|
|
t.Fatalf("Bad: %v", noop.Requests)
|
|
|
|
}
|
|
|
|
noop.Unlock()
|
|
|
|
|
|
|
|
// Wait for a bit for timeouts to trigger and pending revocations to go
|
|
|
|
// through and then we relock
|
|
|
|
time.Sleep(300 * time.Millisecond)
|
|
|
|
|
|
|
|
noop.Lock()
|
|
|
|
defer noop.Unlock()
|
|
|
|
|
|
|
|
// Now make sure that all requests have gone through
|
2015-04-10 21:48:08 +00:00
|
|
|
if len(noop.Requests) != 3 {
|
2015-03-16 21:59:37 +00:00
|
|
|
t.Fatalf("Bad: %v", noop.Requests)
|
|
|
|
}
|
|
|
|
for _, req := range noop.Requests {
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
expect := []string{
|
|
|
|
"foo",
|
|
|
|
"sub/bar",
|
|
|
|
"zip",
|
|
|
|
}
|
|
|
|
sort.Strings(noop.Paths)
|
|
|
|
sort.Strings(expect)
|
|
|
|
if !reflect.DeepEqual(noop.Paths, expect) {
|
|
|
|
t.Fatalf("bad: %v", noop.Paths)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-03 18:58:10 +00:00
|
|
|
func TestExpiration_RenewToken(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
2018-01-19 06:44:44 +00:00
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
2015-04-03 18:58:10 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Register a token
|
|
|
|
auth := &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Hour,
|
2015-04-09 19:14:04 +00:00
|
|
|
Renewable: true,
|
|
|
|
},
|
2015-04-03 18:58:10 +00:00
|
|
|
}
|
2018-09-18 03:03:00 +00:00
|
|
|
|
|
|
|
te := &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/token/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.RegisterAuth(namespace.RootContext(nil), te, auth)
|
2015-04-03 18:58:10 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Renew the token
|
2018-09-18 03:03:00 +00:00
|
|
|
te = &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/token/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
out, err := exp.RenewToken(namespace.RootContext(nil), &logical.Request{}, te, 0)
|
2015-04-03 18:58:10 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
2015-04-11 04:21:06 +00:00
|
|
|
|
2016-03-04 20:03:01 +00:00
|
|
|
if auth.ClientToken != out.Auth.ClientToken {
|
2018-01-18 17:19:18 +00:00
|
|
|
t.Fatalf("bad: %#v", out)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_RenewToken_period(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
2018-06-08 21:24:27 +00:00
|
|
|
root := &logical.TokenEntry{
|
2018-04-03 16:20:20 +00:00
|
|
|
Policies: []string{"root"},
|
|
|
|
Path: "auth/token/root",
|
|
|
|
DisplayName: "root",
|
|
|
|
CreationTime: time.Now().Unix(),
|
|
|
|
Period: time.Minute,
|
2018-09-18 03:03:00 +00:00
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
2018-04-03 16:20:20 +00:00
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
if err := exp.tokenStore.create(namespace.RootContext(nil), root); err != nil {
|
2018-01-18 17:19:18 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Register a token
|
|
|
|
auth := &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: time.Hour,
|
|
|
|
Renewable: true,
|
|
|
|
},
|
|
|
|
Period: time.Minute,
|
|
|
|
}
|
2018-09-18 03:03:00 +00:00
|
|
|
te := &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/token/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err := exp.RegisterAuth(namespace.RootContext(nil), te, auth)
|
2018-01-18 17:19:18 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2020-05-21 17:41:03 +00:00
|
|
|
if exp.leaseCount != 1 {
|
|
|
|
t.Fatalf("expected %v leases, got %v", 1, exp.leaseCount)
|
|
|
|
}
|
|
|
|
|
2018-01-18 17:19:18 +00:00
|
|
|
// Renew the token
|
2018-09-18 03:03:00 +00:00
|
|
|
te = &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/token/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
out, err := exp.RenewToken(namespace.RootContext(nil), &logical.Request{}, te, 0)
|
2018-01-18 17:19:18 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if auth.ClientToken != out.Auth.ClientToken {
|
|
|
|
t.Fatalf("bad: %#v", out)
|
|
|
|
}
|
|
|
|
|
|
|
|
if out.Auth.TTL > time.Minute {
|
|
|
|
t.Fatalf("expected TTL to be less than 1 minute, got: %s", out.Auth.TTL)
|
|
|
|
}
|
2020-05-21 17:41:03 +00:00
|
|
|
|
|
|
|
if exp.leaseCount != 1 {
|
|
|
|
t.Fatalf("expected %v leases, got %v", 1, exp.leaseCount)
|
|
|
|
}
|
2018-01-18 17:19:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_RenewToken_period_backend(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
2018-01-19 06:44:44 +00:00
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
2018-01-18 17:19:18 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Mount a noop backend
|
|
|
|
noop := &NoopBackend{
|
|
|
|
Response: &logical.Response{
|
|
|
|
Auth: &logical.Auth{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 10 * time.Second,
|
|
|
|
Renewable: true,
|
|
|
|
},
|
|
|
|
Period: 5 * time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
DefaultLeaseTTL: 5 * time.Second,
|
|
|
|
MaxLeaseTTL: 5 * time.Second,
|
|
|
|
}
|
|
|
|
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, credentialBarrierPrefix)
|
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "auth/foo/", &MountEntry{Path: "auth/foo/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2018-01-18 17:19:18 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Register a token
|
|
|
|
auth := &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 10 * time.Second,
|
|
|
|
Renewable: true,
|
|
|
|
},
|
|
|
|
Period: 5 * time.Second,
|
|
|
|
}
|
2018-09-18 03:03:00 +00:00
|
|
|
te := &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/foo/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-01-18 17:19:18 +00:00
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.RegisterAuth(namespace.RootContext(nil), te, auth)
|
2018-01-18 17:19:18 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wait 3 seconds
|
|
|
|
time.Sleep(3 * time.Second)
|
2018-09-18 03:03:00 +00:00
|
|
|
te = &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/foo/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err := exp.RenewToken(namespace.RootContext(nil), &logical.Request{}, te, 0)
|
2018-01-18 17:19:18 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected a response")
|
|
|
|
}
|
2018-04-03 16:20:20 +00:00
|
|
|
if resp.Auth.TTL == 0 || resp.Auth.TTL > 5*time.Second {
|
|
|
|
t.Fatalf("expected TTL to be greater than zero and less than or equal to period, got: %s", resp.Auth.TTL)
|
2018-01-18 17:19:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Wait another 3 seconds. If period works correctly, this should not fail
|
|
|
|
time.Sleep(3 * time.Second)
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err = exp.RenewToken(namespace.RootContext(nil), &logical.Request{}, te, 0)
|
2018-01-18 17:19:18 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected a response")
|
|
|
|
}
|
|
|
|
if resp.Auth.TTL < 4*time.Second || resp.Auth.TTL > 5*time.Second {
|
|
|
|
t.Fatalf("expected TTL to be around period's value, got: %s", resp.Auth.TTL)
|
2015-04-06 23:35:39 +00:00
|
|
|
}
|
2015-04-03 18:58:10 +00:00
|
|
|
}
|
|
|
|
|
2015-04-09 00:03:46 +00:00
|
|
|
func TestExpiration_RenewToken_NotRenewable(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
2018-01-19 06:44:44 +00:00
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
2015-04-09 00:03:46 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Register a token
|
|
|
|
auth := &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Hour,
|
2015-04-09 19:14:04 +00:00
|
|
|
Renewable: false,
|
|
|
|
},
|
2015-04-09 00:03:46 +00:00
|
|
|
}
|
2018-09-18 03:03:00 +00:00
|
|
|
te := &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/foo/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.RegisterAuth(namespace.RootContext(nil), te, auth)
|
2015-04-09 00:03:46 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Attempt to renew the token
|
2018-09-18 03:03:00 +00:00
|
|
|
te = &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: "auth/github/login",
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err := exp.RenewToken(namespace.RootContext(nil), &logical.Request{}, te, 0)
|
2018-09-18 03:03:00 +00:00
|
|
|
if err != nil && (err != logical.ErrInvalidRequest || (resp != nil && resp.IsError() && resp.Error().Error() != "invalid lease ID")) {
|
2016-07-08 23:01:36 +00:00
|
|
|
t.Fatalf("bad: err:%v resp:%#v", err, resp)
|
|
|
|
}
|
2016-07-06 20:42:34 +00:00
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected a response")
|
|
|
|
}
|
2015-04-09 00:03:46 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 21:59:37 +00:00
|
|
|
func TestExpiration_Renew(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-03-16 21:59:37 +00:00
|
|
|
|
|
|
|
req := &logical.Request{
|
2017-05-04 16:41:15 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: "foobar",
|
2015-03-16 21:59:37 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
2015-03-16 21:59:37 +00:00
|
|
|
resp := &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2020-07-29 15:13:47 +00:00
|
|
|
TTL: time.Second,
|
2015-04-09 19:14:04 +00:00
|
|
|
Renewable: true,
|
|
|
|
},
|
2015-03-16 21:59:37 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
id, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2015-03-16 21:59:37 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
noop.Response = &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2020-07-29 15:13:47 +00:00
|
|
|
TTL: time.Second,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 21:59:37 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "123",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
out, err := exp.Renew(namespace.RootContext(nil), id, 0)
|
2015-03-16 21:59:37 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-04-29 02:17:45 +00:00
|
|
|
noop.Lock()
|
|
|
|
defer noop.Unlock()
|
|
|
|
|
2015-03-16 21:59:37 +00:00
|
|
|
if !reflect.DeepEqual(out, noop.Response) {
|
|
|
|
t.Fatalf("Bad: %#v", out)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(noop.Requests) != 1 {
|
|
|
|
t.Fatalf("Bad: %#v", noop.Requests)
|
|
|
|
}
|
|
|
|
req = noop.Requests[0]
|
|
|
|
if req.Operation != logical.RenewOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-09 00:03:46 +00:00
|
|
|
func TestExpiration_Renew_NotRenewable(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-04-09 00:03:46 +00:00
|
|
|
|
|
|
|
req := &logical.Request{
|
2017-05-04 16:41:15 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: "foobar",
|
2015-04-09 00:03:46 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
2015-04-09 00:03:46 +00:00
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2020-07-29 15:13:47 +00:00
|
|
|
TTL: time.Second,
|
2015-04-09 19:14:04 +00:00
|
|
|
Renewable: false,
|
|
|
|
},
|
2015-04-09 00:03:46 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
id, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2015-04-09 00:03:46 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
_, err = exp.Renew(namespace.RootContext(nil), id, 0)
|
2015-04-09 00:03:46 +00:00
|
|
|
if err.Error() != "lease is not renewable" {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-04-29 02:17:45 +00:00
|
|
|
noop.Lock()
|
|
|
|
defer noop.Unlock()
|
|
|
|
|
2015-04-09 00:03:46 +00:00
|
|
|
if len(noop.Requests) != 0 {
|
|
|
|
t.Fatalf("Bad: %#v", noop.Requests)
|
|
|
|
}
|
|
|
|
}
|
2015-03-16 21:59:37 +00:00
|
|
|
func TestExpiration_Renew_RevokeOnExpire(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-03-16 21:59:37 +00:00
|
|
|
|
|
|
|
req := &logical.Request{
|
2017-05-04 16:41:15 +00:00
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: "foobar",
|
2015-03-16 21:59:37 +00:00
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
2015-03-16 21:59:37 +00:00
|
|
|
resp := &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: 20 * time.Millisecond,
|
2015-04-09 19:14:04 +00:00
|
|
|
Renewable: true,
|
|
|
|
},
|
2015-03-16 21:59:37 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
id, err := exp.Register(namespace.RootContext(nil), req, resp)
|
2015-03-16 21:59:37 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
noop.Response = &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: 20 * time.Millisecond,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 21:59:37 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "123",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
_, err = exp.Renew(namespace.RootContext(nil), id, 0)
|
2015-03-16 21:59:37 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
start := time.Now()
|
|
|
|
for time.Now().Sub(start) < time.Second {
|
2015-04-29 02:17:45 +00:00
|
|
|
req = nil
|
|
|
|
|
|
|
|
noop.Lock()
|
|
|
|
if len(noop.Requests) >= 2 {
|
|
|
|
req = noop.Requests[1]
|
|
|
|
}
|
|
|
|
noop.Unlock()
|
|
|
|
|
|
|
|
if req == nil {
|
2015-03-16 21:59:37 +00:00
|
|
|
time.Sleep(5 * time.Millisecond)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-18 21:55:38 +00:00
|
|
|
func TestExpiration_Renew_FinalSecond(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: "foobar",
|
|
|
|
}
|
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 2 * time.Second,
|
|
|
|
Renewable: true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx := namespace.RootContext(nil)
|
|
|
|
id, err := exp.Register(ctx, req, resp)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
le, err := exp.loadEntry(ctx, id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
// Give it an auth section to emulate the real world bug
|
|
|
|
le.Auth = &logical.Auth{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
Renewable: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
exp.persistEntry(ctx, le)
|
|
|
|
|
|
|
|
noop.Response = &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 2 * time.Second,
|
|
|
|
MaxTTL: 2 * time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "123",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
time.Sleep(1000 * time.Millisecond)
|
|
|
|
_, err = exp.Renew(ctx, id, 0)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, ok := exp.nonexpiring.Load(id); ok {
|
|
|
|
t.Fatalf("expirable lease became nonexpiring")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_Renew_FinalSecond_Lease(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
err = exp.router.Mount(noop, "prod/aws/", &MountEntry{Path: "prod/aws/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "prod/aws/foo",
|
|
|
|
ClientToken: "foobar",
|
|
|
|
}
|
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "foobar", NamespaceID: "root"})
|
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 2 * time.Second,
|
|
|
|
Renewable: true,
|
|
|
|
},
|
|
|
|
LeaseID: "abcde",
|
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"access_key": "xyz",
|
|
|
|
"secret_key": "abcd",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx := namespace.RootContext(nil)
|
|
|
|
id, err := exp.Register(ctx, req, resp)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
le, err := exp.loadEntry(ctx, id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
// Give it an auth section to emulate the real world bug
|
|
|
|
le.Auth = &logical.Auth{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
Renewable: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
exp.persistEntry(ctx, le)
|
|
|
|
|
|
|
|
time.Sleep(1000 * time.Millisecond)
|
|
|
|
_, err = exp.Renew(ctx, id, 0)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, ok := exp.nonexpiring.Load(id); ok {
|
|
|
|
t.Fatalf("expirable lease became nonexpiring")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-16 20:58:22 +00:00
|
|
|
func TestExpiration_revokeEntry(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
|
|
|
|
noop := &NoopBackend{}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "foo/bar/", &MountEntry{Path: "foo/bar/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-03-16 20:58:22 +00:00
|
|
|
|
|
|
|
le := &leaseEntry{
|
2015-04-08 20:35:32 +00:00
|
|
|
LeaseID: "foo/bar/1234",
|
2015-03-16 20:58:22 +00:00
|
|
|
Path: "foo/bar",
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"testing": true,
|
|
|
|
},
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Minute,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 20:58:22 +00:00
|
|
|
},
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now(),
|
2018-11-05 16:11:32 +00:00
|
|
|
namespace: namespace.RootNamespace,
|
2015-03-16 20:58:22 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.revokeEntry(namespace.RootContext(nil), le)
|
2015-03-16 20:58:22 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-04-29 02:17:45 +00:00
|
|
|
noop.Lock()
|
|
|
|
defer noop.Unlock()
|
|
|
|
|
2015-03-16 20:58:22 +00:00
|
|
|
req := noop.Requests[0]
|
|
|
|
if req.Operation != logical.RevokeOperation {
|
2017-07-01 00:54:05 +00:00
|
|
|
t.Fatalf("bad: operation; req: %#v", req)
|
2015-03-16 20:58:22 +00:00
|
|
|
}
|
2015-03-19 22:11:42 +00:00
|
|
|
if !reflect.DeepEqual(req.Data, le.Data) {
|
2017-07-01 00:54:05 +00:00
|
|
|
t.Fatalf("bad: data; req: %#v\n le: %#v\n", req, le)
|
2015-03-16 20:58:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-24 01:11:15 +00:00
|
|
|
func TestExpiration_revokeEntry_token(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
2018-01-19 06:44:44 +00:00
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
2015-03-24 01:11:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2016-12-16 18:11:55 +00:00
|
|
|
// N.B.: Vault doesn't allow both a secret and auth to be returned, but the
|
|
|
|
// reason for both is that auth needs to be included in order to use the
|
|
|
|
// token store as it's the only mounted backend, *but* RegisterAuth doesn't
|
|
|
|
// actually create the index by token, only Register (for a Secret) does.
|
|
|
|
// So without the Secret we don't do anything when removing the index which
|
|
|
|
// (at the time of writing) now fails because a bug causing every token
|
|
|
|
// expiration to do an extra delete to a non-existent key has been fixed,
|
|
|
|
// and this test relies on this nonstandard behavior.
|
2015-03-24 01:11:15 +00:00
|
|
|
le := &leaseEntry{
|
2015-04-08 20:35:32 +00:00
|
|
|
LeaseID: "foo/bar/1234",
|
2015-04-03 18:58:10 +00:00
|
|
|
Auth: &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Minute,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-24 01:11:15 +00:00
|
|
|
},
|
2016-12-16 18:11:55 +00:00
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: time.Minute,
|
|
|
|
},
|
|
|
|
},
|
2015-11-04 15:48:44 +00:00
|
|
|
ClientToken: root.ID,
|
|
|
|
Path: "foo/bar",
|
|
|
|
IssueTime: time.Now(),
|
2020-09-23 18:46:22 +00:00
|
|
|
ExpireTime: time.Now().Add(time.Minute),
|
2018-11-05 16:11:32 +00:00
|
|
|
namespace: namespace.RootNamespace,
|
2015-11-04 15:48:44 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
2015-11-04 15:48:44 +00:00
|
|
|
t.Fatalf("error persisting entry: %v", err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
if err := exp.createIndexByToken(namespace.RootContext(nil), le, le.ClientToken); err != nil {
|
2015-11-04 15:48:44 +00:00
|
|
|
t.Fatalf("error creating secondary index: %v", err)
|
|
|
|
}
|
2020-09-23 18:46:22 +00:00
|
|
|
exp.updatePending(le)
|
2015-11-04 15:48:44 +00:00
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
indexEntry, err := exp.indexByToken(namespace.RootContext(nil), le)
|
2015-11-04 15:48:44 +00:00
|
|
|
if err != nil {
|
2016-04-13 19:38:29 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
2015-11-04 15:48:44 +00:00
|
|
|
}
|
|
|
|
if indexEntry == nil {
|
|
|
|
t.Fatalf("err: should have found a secondary index entry")
|
2015-03-24 01:11:15 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.revokeEntry(namespace.RootContext(nil), le)
|
2015-03-24 01:11:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2018-05-10 19:50:02 +00:00
|
|
|
time.Sleep(300 * time.Millisecond)
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
out, err := exp.tokenStore.Lookup(namespace.RootContext(nil), le.ClientToken)
|
2015-03-24 01:11:15 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if out != nil {
|
|
|
|
t.Fatalf("bad: %v", out)
|
|
|
|
}
|
2015-11-04 15:48:44 +00:00
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
indexEntry, err = exp.indexByToken(namespace.RootContext(nil), le)
|
2015-11-04 15:48:44 +00:00
|
|
|
if err != nil {
|
2016-04-13 19:38:29 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
2015-11-04 15:48:44 +00:00
|
|
|
}
|
|
|
|
if indexEntry != nil {
|
|
|
|
t.Fatalf("err: should not have found a secondary index entry")
|
|
|
|
}
|
2015-03-24 01:11:15 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 20:58:22 +00:00
|
|
|
func TestExpiration_renewEntry(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
|
|
|
|
noop := &NoopBackend{
|
|
|
|
Response: &logical.Response{
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
Renewable: true,
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Hour,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 20:58:22 +00:00
|
|
|
},
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"testing": false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "foo/bar/", &MountEntry{Path: "foo/bar/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-03-16 20:58:22 +00:00
|
|
|
|
|
|
|
le := &leaseEntry{
|
2015-04-08 20:35:32 +00:00
|
|
|
LeaseID: "foo/bar/1234",
|
2015-03-16 20:58:22 +00:00
|
|
|
Path: "foo/bar",
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"testing": true,
|
|
|
|
},
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Minute,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 20:58:22 +00:00
|
|
|
},
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now(),
|
2018-11-05 16:11:32 +00:00
|
|
|
namespace: namespace.RootNamespace,
|
2015-03-16 20:58:22 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err := exp.renewEntry(namespace.RootContext(nil), le, 0)
|
2015-03-16 20:58:22 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-04-29 02:17:45 +00:00
|
|
|
noop.Lock()
|
|
|
|
defer noop.Unlock()
|
|
|
|
|
2015-03-16 20:58:22 +00:00
|
|
|
if !reflect.DeepEqual(resp, noop.Response) {
|
|
|
|
t.Fatalf("bad: %#v", resp)
|
|
|
|
}
|
|
|
|
|
|
|
|
req := noop.Requests[0]
|
|
|
|
if req.Operation != logical.RenewOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
2015-03-19 22:11:42 +00:00
|
|
|
if !reflect.DeepEqual(req.Data, le.Data) {
|
2015-03-16 21:59:37 +00:00
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
2015-03-16 20:58:22 +00:00
|
|
|
}
|
|
|
|
|
Vault-1403 Switch Expiration Manager to use Fairsharing Backpressure (#1709) (#10932)
* basic pool and start testing
* refactor a bit for testing
* workFunc, start/stop safety, testing
* cleanup function for worker quit, more tests
* redo public/private members
* improve tests, export types, switch uuid package
* fix loop capture bug, cleanup
* cleanup tests
* update worker pool file name, other improvements
* add job manager prototype
* remove remnants
* add functions to wait for job manager and worker pool to stop, other fixes
* test job manager functionality, fix bugs
* encapsulate how jobs are distributed to workers
* make worker job channel read only
* add job interface, more testing, fixes
* set name for dispatcher
* fix test races
* wire up expiration manager most of the way
* dispatcher and job manager constructors don't return errors
* logger now dependency injected
* make some members private, test fcn to get worker pool size
* make GetNumWorkers public
* Update helper/fairshare/jobmanager_test.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* update fairsharing usage, add tests
* make workerpool private
* remove custom worker names
* concurrency improvements
* remove worker pool cleanup function
* remove cleanup func from job manager, remove non blocking stop from fairshare
* update job manager for new constructor
* stop job manager when expiration manager stopped
* unset env var after test
* stop fairshare when started in tests
* stop leaking job manager goroutine
* prototype channel for waking up to assign work
* fix typo/bug and add tests
* improve job manager wake up, fix test typo
* put channel drain back
* better start/pause test for job manager
* comment cleanup
* degrade possible noisy log
* remove closure, clean up context
* improve revocation context timer
* test: reduce number of revocation workers during many tests
* Update vault/expiration.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* feedback tweaks
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
2021-02-17 22:30:27 +00:00
|
|
|
func revokeEntryRejectedCore(t *testing.T, e ExpireLeaseStrategy) {
|
|
|
|
t.Helper()
|
|
|
|
|
2018-07-11 19:45:09 +00:00
|
|
|
core, _, _ := TestCoreUnsealed(t)
|
|
|
|
exp := core.expiration
|
|
|
|
|
|
|
|
rejected := new(uint32)
|
|
|
|
|
|
|
|
noop := &NoopBackend{
|
|
|
|
RequestHandler: func(ctx context.Context, req *logical.Request) (*logical.Response, error) {
|
|
|
|
if req.Operation == logical.RevokeOperation {
|
|
|
|
if atomic.CompareAndSwapUint32(rejected, 0, 1) {
|
|
|
|
t.Logf("denying revocation")
|
|
|
|
return nil, errors.New("nope")
|
|
|
|
}
|
|
|
|
t.Logf("allowing revocation")
|
|
|
|
}
|
|
|
|
return nil, nil
|
|
|
|
},
|
|
|
|
}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
|
|
|
view := NewBarrierView(barrier, "logical/")
|
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "foo/bar/", &MountEntry{Path: "foo/bar/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2018-07-11 19:45:09 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
le := &leaseEntry{
|
|
|
|
LeaseID: "foo/bar/1234",
|
|
|
|
Path: "foo/bar",
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"testing": true,
|
|
|
|
},
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: time.Minute,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now().Add(time.Minute),
|
2018-11-05 16:11:32 +00:00
|
|
|
namespace: namespace.RootNamespace,
|
2018-07-11 19:45:09 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.persistEntry(namespace.RootContext(nil), le)
|
2018-07-11 19:45:09 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.LazyRevoke(namespace.RootContext(nil), le.LeaseID)
|
2018-07-11 19:45:09 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Give time to let the request be handled
|
|
|
|
time.Sleep(1 * time.Second)
|
|
|
|
|
|
|
|
if atomic.LoadUint32(rejected) != 1 {
|
|
|
|
t.Fatal("unexpected val for rejected")
|
|
|
|
}
|
|
|
|
|
|
|
|
err = exp.Stop()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
Vault-1403 Switch Expiration Manager to use Fairsharing Backpressure (#1709) (#10932)
* basic pool and start testing
* refactor a bit for testing
* workFunc, start/stop safety, testing
* cleanup function for worker quit, more tests
* redo public/private members
* improve tests, export types, switch uuid package
* fix loop capture bug, cleanup
* cleanup tests
* update worker pool file name, other improvements
* add job manager prototype
* remove remnants
* add functions to wait for job manager and worker pool to stop, other fixes
* test job manager functionality, fix bugs
* encapsulate how jobs are distributed to workers
* make worker job channel read only
* add job interface, more testing, fixes
* set name for dispatcher
* fix test races
* wire up expiration manager most of the way
* dispatcher and job manager constructors don't return errors
* logger now dependency injected
* make some members private, test fcn to get worker pool size
* make GetNumWorkers public
* Update helper/fairshare/jobmanager_test.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* update fairsharing usage, add tests
* make workerpool private
* remove custom worker names
* concurrency improvements
* remove worker pool cleanup function
* remove cleanup func from job manager, remove non blocking stop from fairshare
* update job manager for new constructor
* stop job manager when expiration manager stopped
* unset env var after test
* stop fairshare when started in tests
* stop leaking job manager goroutine
* prototype channel for waking up to assign work
* fix typo/bug and add tests
* improve job manager wake up, fix test typo
* put channel drain back
* better start/pause test for job manager
* comment cleanup
* degrade possible noisy log
* remove closure, clean up context
* improve revocation context timer
* test: reduce number of revocation workers during many tests
* Update vault/expiration.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* feedback tweaks
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
2021-02-17 22:30:27 +00:00
|
|
|
err = core.setupExpiration(e)
|
2018-07-11 19:45:09 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
exp = core.expiration
|
|
|
|
|
|
|
|
for {
|
|
|
|
if !exp.inRestoreMode() {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now let the revocation actually process
|
|
|
|
time.Sleep(1 * time.Second)
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
le, err = exp.FetchLeaseTimes(namespace.RootContext(nil), le.LeaseID)
|
2018-07-11 19:45:09 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if le != nil {
|
2018-07-12 14:18:50 +00:00
|
|
|
t.Fatal("lease entry not nil")
|
2018-07-11 19:45:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Vault-1403 Switch Expiration Manager to use Fairsharing Backpressure (#1709) (#10932)
* basic pool and start testing
* refactor a bit for testing
* workFunc, start/stop safety, testing
* cleanup function for worker quit, more tests
* redo public/private members
* improve tests, export types, switch uuid package
* fix loop capture bug, cleanup
* cleanup tests
* update worker pool file name, other improvements
* add job manager prototype
* remove remnants
* add functions to wait for job manager and worker pool to stop, other fixes
* test job manager functionality, fix bugs
* encapsulate how jobs are distributed to workers
* make worker job channel read only
* add job interface, more testing, fixes
* set name for dispatcher
* fix test races
* wire up expiration manager most of the way
* dispatcher and job manager constructors don't return errors
* logger now dependency injected
* make some members private, test fcn to get worker pool size
* make GetNumWorkers public
* Update helper/fairshare/jobmanager_test.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* update fairsharing usage, add tests
* make workerpool private
* remove custom worker names
* concurrency improvements
* remove worker pool cleanup function
* remove cleanup func from job manager, remove non blocking stop from fairshare
* update job manager for new constructor
* stop job manager when expiration manager stopped
* unset env var after test
* stop fairshare when started in tests
* stop leaking job manager goroutine
* prototype channel for waking up to assign work
* fix typo/bug and add tests
* improve job manager wake up, fix test typo
* put channel drain back
* better start/pause test for job manager
* comment cleanup
* degrade possible noisy log
* remove closure, clean up context
* improve revocation context timer
* test: reduce number of revocation workers during many tests
* Update vault/expiration.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* feedback tweaks
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
2021-02-17 22:30:27 +00:00
|
|
|
func TestExpiration_revokeEntry_rejected_revoke(t *testing.T) {
|
|
|
|
revokeEntryRejectedCore(t, expireLeaseStrategyRevoke)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_revokeEntry_rejected_fairsharing(t *testing.T) {
|
|
|
|
revokeEntryRejectedCore(t, expireLeaseStrategyFairsharing)
|
|
|
|
}
|
|
|
|
|
2015-04-10 21:07:06 +00:00
|
|
|
func TestExpiration_renewAuthEntry(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
|
|
|
|
noop := &NoopBackend{
|
|
|
|
Response: &logical.Response{
|
|
|
|
Auth: &logical.Auth{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
Renewable: true,
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Hour,
|
2015-04-10 21:07:06 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
_, barrier, _ := mockBarrier(t)
|
2018-01-18 17:19:18 +00:00
|
|
|
view := NewBarrierView(barrier, "auth/")
|
2016-01-13 18:40:08 +00:00
|
|
|
meUUID, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.router.Mount(noop, "auth/foo/", &MountEntry{Path: "auth/foo/", Type: "noop", UUID: meUUID, Accessor: "noop-accessor", namespace: namespace.RootNamespace}, view)
|
2017-07-01 00:54:05 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2015-04-10 21:07:06 +00:00
|
|
|
|
|
|
|
le := &leaseEntry{
|
|
|
|
LeaseID: "auth/foo/1234",
|
|
|
|
Path: "auth/foo/login",
|
|
|
|
Auth: &logical.Auth{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
Renewable: true,
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Minute,
|
2015-04-10 21:07:06 +00:00
|
|
|
},
|
2015-05-09 18:39:54 +00:00
|
|
|
InternalData: map[string]interface{}{
|
|
|
|
"MySecret": "secret",
|
|
|
|
},
|
2015-04-10 21:07:06 +00:00
|
|
|
},
|
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now().Add(time.Minute),
|
2018-11-05 16:11:32 +00:00
|
|
|
namespace: namespace.RootNamespace,
|
2015-04-10 21:07:06 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err := exp.renewAuthEntry(namespace.RootContext(nil), &logical.Request{}, le, 0)
|
2015-04-10 21:07:06 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-04-29 02:17:45 +00:00
|
|
|
noop.Lock()
|
|
|
|
defer noop.Unlock()
|
|
|
|
|
2015-04-10 21:07:06 +00:00
|
|
|
if !reflect.DeepEqual(resp, noop.Response) {
|
|
|
|
t.Fatalf("bad: %#v", resp)
|
|
|
|
}
|
|
|
|
|
|
|
|
req := noop.Requests[0]
|
|
|
|
if req.Operation != logical.RenewOperation {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
|
|
|
if req.Path != "login" {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
2015-05-09 18:39:54 +00:00
|
|
|
if req.Auth.InternalData["MySecret"] != "secret" {
|
|
|
|
t.Fatalf("Bad: %v", req)
|
|
|
|
}
|
2015-04-10 21:07:06 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 20:40:03 +00:00
|
|
|
func TestExpiration_PersistLoadDelete(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
2017-01-24 15:21:41 +00:00
|
|
|
lastTime := time.Now()
|
2015-03-16 20:40:03 +00:00
|
|
|
le := &leaseEntry{
|
2015-04-08 20:35:32 +00:00
|
|
|
LeaseID: "foo/bar/1234",
|
2015-03-16 20:40:03 +00:00
|
|
|
Path: "foo/bar",
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"testing": true,
|
|
|
|
},
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2015-08-21 00:47:17 +00:00
|
|
|
TTL: time.Minute,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-16 20:40:03 +00:00
|
|
|
},
|
2017-01-24 15:21:41 +00:00
|
|
|
IssueTime: lastTime,
|
|
|
|
ExpireTime: lastTime,
|
|
|
|
LastRenewalTime: lastTime,
|
2018-11-05 16:11:32 +00:00
|
|
|
namespace: namespace.RootNamespace,
|
2015-03-16 20:40:03 +00:00
|
|
|
}
|
2018-11-05 16:11:32 +00:00
|
|
|
if err := exp.persistEntry(namespace.RootContext(nil), le); err != nil {
|
2015-03-16 20:40:03 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
out, err := exp.loadEntry(namespace.RootContext(nil), "foo/bar/1234")
|
2015-03-16 20:40:03 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
2017-01-24 16:17:48 +00:00
|
|
|
if !le.LastRenewalTime.Equal(out.LastRenewalTime) ||
|
|
|
|
!le.IssueTime.Equal(out.IssueTime) ||
|
|
|
|
!le.ExpireTime.Equal(out.ExpireTime) {
|
|
|
|
t.Fatalf("bad: expected:\n%#v\nactual:\n%#v", le, out)
|
|
|
|
}
|
2016-07-07 21:44:14 +00:00
|
|
|
le.LastRenewalTime = out.LastRenewalTime
|
2017-01-24 16:17:48 +00:00
|
|
|
le.IssueTime = out.IssueTime
|
|
|
|
le.ExpireTime = out.ExpireTime
|
2015-03-16 20:40:03 +00:00
|
|
|
if !reflect.DeepEqual(out, le) {
|
2017-01-23 19:08:29 +00:00
|
|
|
t.Fatalf("bad: expected:\n%#v\nactual:\n%#v", le, out)
|
2015-03-16 20:40:03 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err = exp.deleteEntry(namespace.RootContext(nil), le)
|
2015-03-16 20:40:03 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
out, err = exp.loadEntry(namespace.RootContext(nil), "foo/bar/1234")
|
2015-03-16 20:40:03 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if out != nil {
|
|
|
|
t.Fatalf("out: %#v", out)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-13 17:55:54 +00:00
|
|
|
func TestLeaseEntry(t *testing.T) {
|
|
|
|
le := &leaseEntry{
|
2015-04-08 20:35:32 +00:00
|
|
|
LeaseID: "foo/bar/1234",
|
2015-03-13 17:55:54 +00:00
|
|
|
Path: "foo/bar",
|
|
|
|
Data: map[string]interface{}{
|
|
|
|
"testing": true,
|
|
|
|
},
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: &logical.Secret{
|
2015-04-09 19:14:04 +00:00
|
|
|
LeaseOptions: logical.LeaseOptions{
|
2017-05-04 02:03:42 +00:00
|
|
|
TTL: time.Minute,
|
|
|
|
Renewable: true,
|
2015-04-09 19:14:04 +00:00
|
|
|
},
|
2015-03-13 17:55:54 +00:00
|
|
|
},
|
2016-07-07 21:44:14 +00:00
|
|
|
IssueTime: time.Now(),
|
|
|
|
ExpireTime: time.Now(),
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
enc, err := le.encode()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
out, err := decodeLeaseEntry(enc)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !reflect.DeepEqual(out.Data, le.Data) {
|
|
|
|
t.Fatalf("got: %#v, expect %#v", out, le)
|
|
|
|
}
|
2017-05-04 02:03:42 +00:00
|
|
|
|
|
|
|
// Test renewability
|
|
|
|
le.ExpireTime = time.Time{}
|
|
|
|
if r, _ := le.renewable(); r {
|
|
|
|
t.Fatal("lease with zero expire time is not renewable")
|
|
|
|
}
|
|
|
|
le.ExpireTime = time.Now().Add(-1 * time.Hour)
|
|
|
|
if r, _ := le.renewable(); r {
|
|
|
|
t.Fatal("lease with expire time in the past is not renewable")
|
|
|
|
}
|
|
|
|
le.ExpireTime = time.Now().Add(1 * time.Hour)
|
|
|
|
if r, err := le.renewable(); !r {
|
|
|
|
t.Fatalf("lease with future expire time is renewable, err: %v", err)
|
|
|
|
}
|
|
|
|
le.Secret.LeaseOptions.Renewable = false
|
|
|
|
if r, _ := le.renewable(); r {
|
|
|
|
t.Fatal("secret is set to not be renewable but returns as renewable")
|
|
|
|
}
|
|
|
|
le.Secret = nil
|
|
|
|
le.Auth = &logical.Auth{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
Renewable: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
if r, err := le.renewable(); !r {
|
|
|
|
t.Fatalf("auth is renewable but is set to not be, err: %v", err)
|
|
|
|
}
|
|
|
|
le.Auth.LeaseOptions.Renewable = false
|
|
|
|
if r, _ := le.renewable(); r {
|
|
|
|
t.Fatal("auth is set to not be renewable but returns as renewable")
|
|
|
|
}
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
2016-03-09 21:47:58 +00:00
|
|
|
|
|
|
|
func TestExpiration_RevokeForce(t *testing.T) {
|
2018-06-03 22:14:51 +00:00
|
|
|
core, _, root := TestCoreUnsealed(t)
|
2016-03-09 21:47:58 +00:00
|
|
|
|
|
|
|
core.logicalBackends["badrenew"] = badRenewFactory
|
|
|
|
me := &MountEntry{
|
2017-07-01 00:54:05 +00:00
|
|
|
Table: mountTableType,
|
|
|
|
Path: "badrenew/",
|
|
|
|
Type: "badrenew",
|
|
|
|
Accessor: "badrenewaccessor",
|
2016-03-09 21:47:58 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err := core.mount(namespace.RootContext(nil), me)
|
2016-03-09 21:47:58 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "badrenew/creds",
|
|
|
|
ClientToken: root,
|
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: root, NamespaceID: "root", Policies: []string{"root"}})
|
2016-03-09 21:47:58 +00:00
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err := core.HandleRequest(namespace.RootContext(nil), req)
|
2016-03-09 21:47:58 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("response was nil")
|
|
|
|
}
|
|
|
|
if resp.Secret == nil {
|
|
|
|
t.Fatalf("response secret was nil, response was %#v", *resp)
|
|
|
|
}
|
|
|
|
|
|
|
|
req.Operation = logical.UpdateOperation
|
|
|
|
req.Path = "sys/revoke-prefix/badrenew/creds"
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err = core.HandleRequest(namespace.RootContext(nil), req)
|
2016-03-09 21:47:58 +00:00
|
|
|
if err == nil {
|
|
|
|
t.Fatal("expected error")
|
|
|
|
}
|
|
|
|
|
|
|
|
req.Path = "sys/revoke-force/badrenew/creds"
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err = core.HandleRequest(namespace.RootContext(nil), req)
|
2016-03-09 21:47:58 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("got error: %s", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-26 20:26:07 +00:00
|
|
|
func TestExpiration_RevokeForceSingle(t *testing.T) {
|
2018-06-03 22:14:51 +00:00
|
|
|
core, _, root := TestCoreUnsealed(t)
|
2018-04-26 20:26:07 +00:00
|
|
|
|
|
|
|
core.logicalBackends["badrenew"] = badRenewFactory
|
|
|
|
me := &MountEntry{
|
|
|
|
Table: mountTableType,
|
|
|
|
Path: "badrenew/",
|
|
|
|
Type: "badrenew",
|
|
|
|
Accessor: "badrenewaccessor",
|
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err := core.mount(namespace.RootContext(nil), me)
|
2018-04-26 20:26:07 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
|
|
|
Path: "badrenew/creds",
|
|
|
|
ClientToken: root,
|
|
|
|
}
|
2018-10-15 16:56:24 +00:00
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: root, NamespaceID: "root", Policies: []string{"root"}})
|
2018-04-26 20:26:07 +00:00
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err := core.HandleRequest(namespace.RootContext(nil), req)
|
2018-04-26 20:26:07 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("response was nil")
|
|
|
|
}
|
|
|
|
if resp.Secret == nil {
|
|
|
|
t.Fatalf("response secret was nil, response was %#v", *resp)
|
|
|
|
}
|
|
|
|
leaseID := resp.Secret.LeaseID
|
|
|
|
|
|
|
|
req.Operation = logical.UpdateOperation
|
|
|
|
req.Path = "sys/leases/lookup"
|
|
|
|
req.Data = map[string]interface{}{"lease_id": leaseID}
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err = core.HandleRequest(namespace.RootContext(nil), req)
|
2018-04-26 20:26:07 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("nil response")
|
|
|
|
}
|
|
|
|
if resp.Data["id"].(string) != leaseID {
|
|
|
|
t.Fatalf("expected id %q, got %q", leaseID, resp.Data["id"].(string))
|
|
|
|
}
|
|
|
|
|
|
|
|
req.Path = "sys/revoke-prefix/" + leaseID
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err = core.HandleRequest(namespace.RootContext(nil), req)
|
2018-04-26 20:26:07 +00:00
|
|
|
if err == nil {
|
|
|
|
t.Fatal("expected error")
|
|
|
|
}
|
|
|
|
|
|
|
|
req.Path = "sys/revoke-force/" + leaseID
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err = core.HandleRequest(namespace.RootContext(nil), req)
|
2018-04-26 20:26:07 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("got error: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
req.Path = "sys/leases/lookup"
|
|
|
|
req.Data = map[string]interface{}{"lease_id": leaseID}
|
2018-11-05 16:11:32 +00:00
|
|
|
resp, err = core.HandleRequest(namespace.RootContext(nil), req)
|
2018-04-26 20:26:07 +00:00
|
|
|
if err == nil {
|
|
|
|
t.Fatal("expected error")
|
|
|
|
}
|
|
|
|
if !strings.Contains(err.Error(), "invalid request") {
|
|
|
|
t.Fatalf("bad error: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-01-19 06:44:44 +00:00
|
|
|
func badRenewFactory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
|
2016-03-09 21:47:58 +00:00
|
|
|
be := &framework.Backend{
|
|
|
|
Paths: []*framework.Path{
|
2018-09-18 03:03:00 +00:00
|
|
|
{
|
2016-03-09 21:47:58 +00:00
|
|
|
Pattern: "creds",
|
|
|
|
Callbacks: map[logical.Operation]framework.OperationFunc{
|
2018-01-08 18:31:38 +00:00
|
|
|
logical.ReadOperation: func(context.Context, *logical.Request, *framework.FieldData) (*logical.Response, error) {
|
2016-03-09 21:47:58 +00:00
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
InternalData: map[string]interface{}{
|
|
|
|
"secret_type": "badRenewBackend",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
resp.Secret.TTL = time.Second * 30
|
|
|
|
return resp, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
Secrets: []*framework.Secret{
|
2021-04-08 16:43:39 +00:00
|
|
|
{
|
2016-03-09 21:47:58 +00:00
|
|
|
Type: "badRenewBackend",
|
2018-01-08 18:31:38 +00:00
|
|
|
Revoke: func(context.Context, *logical.Request, *framework.FieldData) (*logical.Response, error) {
|
2016-03-09 21:47:58 +00:00
|
|
|
return nil, fmt.Errorf("always errors")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2018-11-07 01:21:24 +00:00
|
|
|
BackendType: logical.TypeLogical,
|
2016-03-09 21:47:58 +00:00
|
|
|
}
|
|
|
|
|
2018-11-05 16:11:32 +00:00
|
|
|
err := be.Setup(namespace.RootContext(nil), conf)
|
Backend plugin system (#2874)
* Add backend plugin changes
* Fix totp backend plugin tests
* Fix logical/plugin InvalidateKey test
* Fix plugin catalog CRUD test, fix NoopBackend
* Clean up commented code block
* Fix system backend mount test
* Set plugin_name to omitempty, fix handleMountTable config parsing
* Clean up comments, keep shim connections alive until cleanup
* Include pluginClient, disallow LookupPlugin call from within a plugin
* Add wrapper around backendPluginClient for proper cleanup
* Add logger shim tests
* Add logger, storage, and system shim tests
* Use pointer receivers for system view shim
* Use plugin name if no path is provided on mount
* Enable plugins for auth backends
* Add backend type attribute, move builtin/plugin/package
* Fix merge conflict
* Fix missing plugin name in mount config
* Add integration tests on enabling auth backend plugins
* Remove dependency cycle on mock-plugin
* Add passthrough backend plugin, use logical.BackendType to determine lease generation
* Remove vault package dependency on passthrough package
* Add basic impl test for passthrough plugin
* Incorporate feedback; set b.backend after shims creation on backendPluginServer
* Fix totp plugin test
* Add plugin backends docs
* Fix tests
* Fix builtin/plugin tests
* Remove flatten from PluginRunner fields
* Move mock plugin to logical/plugin, remove totp and passthrough plugins
* Move pluginMap into newPluginClient
* Do not create storage RPC connection on HandleRequest and HandleExistenceCheck
* Change shim logger's Fatal to no-op
* Change BackendType to uint32, match UX backend types
* Change framework.Backend Setup signature
* Add Setup func to logical.Backend interface
* Move OptionallyEnableMlock call into plugin.Serve, update docs and comments
* Remove commented var in plugin package
* RegisterLicense on logical.Backend interface (#3017)
* Add RegisterLicense to logical.Backend interface
* Update RegisterLicense to use callback func on framework.Backend
* Refactor framework.Backend.RegisterLicense
* plugin: Prevent plugin.SystemViewClient.ResponseWrapData from getting JWTs
* plugin: Revert BackendType to remove TypePassthrough and related references
* Fix typo in plugin backends docs
2017-07-20 17:28:40 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return be, nil
|
2016-03-09 21:47:58 +00:00
|
|
|
}
|
2020-06-15 23:54:36 +00:00
|
|
|
|
|
|
|
func sampleToken(t *testing.T, exp *ExpirationManager, path string, expiring bool, policy string) *logical.TokenEntry {
|
|
|
|
t.Helper()
|
|
|
|
|
|
|
|
root, err := exp.tokenStore.rootToken(context.Background())
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
auth := &logical.Auth{
|
|
|
|
ClientToken: root.ID,
|
|
|
|
Policies: []string{policy},
|
|
|
|
}
|
|
|
|
if expiring {
|
|
|
|
auth.LeaseOptions = logical.LeaseOptions{
|
|
|
|
TTL: time.Hour,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
te := &logical.TokenEntry{
|
|
|
|
ID: root.ID,
|
|
|
|
Path: path,
|
|
|
|
NamespaceID: namespace.RootNamespaceID,
|
|
|
|
Policies: auth.Policies,
|
|
|
|
}
|
|
|
|
|
|
|
|
err = exp.RegisterAuth(namespace.RootContext(nil), te, auth)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return te
|
|
|
|
}
|
|
|
|
|
|
|
|
func findMatchingPath(path string, tokenEntries []*logical.TokenEntry) bool {
|
|
|
|
for _, te := range tokenEntries {
|
|
|
|
if path == te.Path {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func findMatchingPolicy(policy string, tokenEntries []*logical.TokenEntry) bool {
|
|
|
|
for _, te := range tokenEntries {
|
|
|
|
for _, p := range te.Policies {
|
|
|
|
if policy == p {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_WalkTokens(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
|
|
|
|
tokenEntries := []*logical.TokenEntry{
|
|
|
|
sampleToken(t, exp, "auth/userpass/login", true, "default"),
|
|
|
|
sampleToken(t, exp, "auth/userpass/login", true, "policy23457"),
|
|
|
|
sampleToken(t, exp, "auth/token/create", false, "root"),
|
|
|
|
sampleToken(t, exp, "auth/github/login", true, "root"),
|
|
|
|
sampleToken(t, exp, "auth/github/login", false, "root"),
|
|
|
|
}
|
|
|
|
|
2020-06-23 23:36:24 +00:00
|
|
|
waitForRestore(t, exp)
|
|
|
|
|
2020-06-15 23:54:36 +00:00
|
|
|
for true {
|
|
|
|
// Count before and after each revocation
|
|
|
|
t.Logf("Counting %d tokens.", len(tokenEntries))
|
|
|
|
count := 0
|
|
|
|
exp.WalkTokens(func(leaseId string, auth *logical.Auth, path string) bool {
|
|
|
|
count += 1
|
|
|
|
t.Logf("Lease ID %d: %q\n", count, leaseId)
|
|
|
|
if !findMatchingPath(path, tokenEntries) {
|
|
|
|
t.Errorf("Mismatched Path: %v", path)
|
|
|
|
}
|
|
|
|
if len(auth.Policies) < 1 || !findMatchingPolicy(auth.Policies[0], tokenEntries) {
|
|
|
|
t.Errorf("Mismatched Policies: %v", auth.Policies)
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
})
|
|
|
|
if count != len(tokenEntries) {
|
|
|
|
t.Errorf("Mismatched number of tokens: %v", count)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(tokenEntries) == 0 {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
|
|
|
|
// Revoke last token
|
|
|
|
toRevoke := len(tokenEntries) - 1
|
|
|
|
leaseId, err := exp.CreateOrFetchRevocationLeaseByToken(namespace.RootContext(nil), tokenEntries[toRevoke])
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
t.Logf("revocation lease ID: %q", leaseId)
|
|
|
|
err = exp.Revoke(namespace.RootContext(nil), leaseId)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
tokenEntries = tokenEntries[:len(tokenEntries)-1]
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-23 23:36:24 +00:00
|
|
|
func waitForRestore(t *testing.T, exp *ExpirationManager) {
|
|
|
|
t.Helper()
|
|
|
|
|
|
|
|
timeout := time.After(200 * time.Millisecond)
|
|
|
|
ticker := time.Tick(5 * time.Millisecond)
|
|
|
|
|
|
|
|
for exp.inRestoreMode() {
|
|
|
|
select {
|
|
|
|
case <-timeout:
|
|
|
|
t.Fatalf("Timeout waiting for expiration manager to recover.")
|
|
|
|
case <-ticker:
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-15 23:54:36 +00:00
|
|
|
func TestExpiration_CachedPolicyIsShared(t *testing.T) {
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
|
|
|
|
tokenEntries := []*logical.TokenEntry{
|
|
|
|
sampleToken(t, exp, "auth/userpass/login", true, "policy23457"),
|
|
|
|
sampleToken(t, exp, "auth/github/login", true, strings.Join([]string{"policy", "23457"}, "")),
|
|
|
|
sampleToken(t, exp, "auth/token/create", true, "policy23457"),
|
|
|
|
}
|
|
|
|
|
|
|
|
var policies [][]string
|
|
|
|
|
2020-06-23 23:36:24 +00:00
|
|
|
waitForRestore(t, exp)
|
2020-06-15 23:54:36 +00:00
|
|
|
exp.WalkTokens(func(leaseId string, auth *logical.Auth, path string) bool {
|
|
|
|
policies = append(policies, auth.Policies)
|
|
|
|
return true
|
|
|
|
})
|
|
|
|
if len(policies) != len(tokenEntries) {
|
|
|
|
t.Fatalf("Mismatched number of tokens: %v", len(policies))
|
|
|
|
}
|
|
|
|
ptrs := make([]*string, len(policies))
|
|
|
|
for i := range ptrs {
|
|
|
|
ptrs[i] = &((policies[0])[0])
|
|
|
|
}
|
|
|
|
for i := 1; i < len(ptrs); i++ {
|
|
|
|
if ptrs[i-1] != ptrs[i] {
|
|
|
|
t.Errorf("Mismatched pointers: %v and %v", ptrs[i-1], ptrs[i])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Vault-1403 Switch Expiration Manager to use Fairsharing Backpressure (#1709) (#10932)
* basic pool and start testing
* refactor a bit for testing
* workFunc, start/stop safety, testing
* cleanup function for worker quit, more tests
* redo public/private members
* improve tests, export types, switch uuid package
* fix loop capture bug, cleanup
* cleanup tests
* update worker pool file name, other improvements
* add job manager prototype
* remove remnants
* add functions to wait for job manager and worker pool to stop, other fixes
* test job manager functionality, fix bugs
* encapsulate how jobs are distributed to workers
* make worker job channel read only
* add job interface, more testing, fixes
* set name for dispatcher
* fix test races
* wire up expiration manager most of the way
* dispatcher and job manager constructors don't return errors
* logger now dependency injected
* make some members private, test fcn to get worker pool size
* make GetNumWorkers public
* Update helper/fairshare/jobmanager_test.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* update fairsharing usage, add tests
* make workerpool private
* remove custom worker names
* concurrency improvements
* remove worker pool cleanup function
* remove cleanup func from job manager, remove non blocking stop from fairshare
* update job manager for new constructor
* stop job manager when expiration manager stopped
* unset env var after test
* stop fairshare when started in tests
* stop leaking job manager goroutine
* prototype channel for waking up to assign work
* fix typo/bug and add tests
* improve job manager wake up, fix test typo
* put channel drain back
* better start/pause test for job manager
* comment cleanup
* degrade possible noisy log
* remove closure, clean up context
* improve revocation context timer
* test: reduce number of revocation workers during many tests
* Update vault/expiration.go
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
* feedback tweaks
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
2021-02-17 22:30:27 +00:00
|
|
|
|
|
|
|
func TestExpiration_FairsharingEnvVar(t *testing.T) {
|
|
|
|
testCases := []struct {
|
|
|
|
set string
|
|
|
|
expected int
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
set: "15",
|
|
|
|
expected: 15,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
set: "0",
|
|
|
|
expected: numExpirationWorkersTest,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
set: "10001",
|
|
|
|
expected: numExpirationWorkersTest,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
defer os.Unsetenv(fairshareWorkersOverrideVar)
|
|
|
|
for _, tc := range testCases {
|
|
|
|
os.Setenv(fairshareWorkersOverrideVar, tc.set)
|
|
|
|
exp := mockExpiration(t)
|
|
|
|
|
|
|
|
if fairshare.GetNumWorkers(exp.jobManager) != tc.expected {
|
|
|
|
t.Errorf("bad worker pool size. expected %d, got %d", tc.expected, fairshare.GetNumWorkers(exp.jobManager))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-04-29 15:12:02 +00:00
|
|
|
|
|
|
|
// register one lease ID and return the leaseID
|
|
|
|
func registerOneLease(t *testing.T, ctx context.Context, exp *ExpirationManager) string {
|
|
|
|
t.Helper()
|
|
|
|
|
|
|
|
req := &logical.Request{
|
|
|
|
Operation: logical.ReadOperation,
|
2021-05-04 21:48:02 +00:00
|
|
|
Path: "irrevocable/lease",
|
2021-04-29 15:12:02 +00:00
|
|
|
ClientToken: "sometoken",
|
|
|
|
}
|
|
|
|
req.SetTokenEntry(&logical.TokenEntry{ID: "sometoken", NamespaceID: "root"})
|
|
|
|
resp := &logical.Response{
|
|
|
|
Secret: &logical.Secret{
|
|
|
|
LeaseOptions: logical.LeaseOptions{
|
|
|
|
TTL: 10 * time.Hour,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
leaseID, err := exp.Register(ctx, req, resp)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return leaseID
|
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
func TestExpiration_MarkIrrevocable(t *testing.T) {
|
2021-05-06 16:39:01 +00:00
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
exp := c.expiration
|
2021-04-29 15:12:02 +00:00
|
|
|
ctx := namespace.RootContext(nil)
|
|
|
|
|
|
|
|
leaseID := registerOneLease(t, ctx, exp)
|
|
|
|
loadedLE, err := exp.loadEntry(ctx, leaseID)
|
|
|
|
if err != nil {
|
2021-05-04 21:48:02 +00:00
|
|
|
t.Fatalf("error loading non irrevocable lease: %v", err)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
if loadedLE.isIrrevocable() {
|
|
|
|
t.Fatalf("lease is irrevocable and shouldn't be")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
if _, ok := exp.irrevocable.Load(leaseID); ok {
|
|
|
|
t.Fatalf("lease included in irrevocable map")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
if _, ok := exp.pending.Load(leaseID); !ok {
|
|
|
|
t.Fatalf("lease not included in pending map")
|
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
irrevocableErr := fmt.Errorf("test irrevocable error")
|
|
|
|
exp.markLeaseIrrevocable(ctx, loadedLE, irrevocableErr)
|
2021-04-29 15:12:02 +00:00
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
if !loadedLE.isIrrevocable() {
|
|
|
|
t.Fatalf("irrevocable lease is not irrevocable and should be")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
if loadedLE.RevokeErr != irrevocableErr.Error() {
|
|
|
|
t.Errorf("irrevocable lease has wrong error message. expected %s, got %s", irrevocableErr.Error(), loadedLE.RevokeErr)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
if _, ok := exp.irrevocable.Load(leaseID); !ok {
|
|
|
|
t.Fatalf("irrevocable lease not included in irrevocable map")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
if _, ok := exp.pending.Load(leaseID); ok {
|
2021-05-04 21:48:02 +00:00
|
|
|
t.Fatalf("irrevocable lease included in pending map")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
if _, ok := exp.nonexpiring.Load(leaseID); ok {
|
2021-05-04 21:48:02 +00:00
|
|
|
t.Fatalf("irrevocable lease included in nonexpiring map")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
// stop and restore to verify that irrevocable leases are properly loaded from storage
|
2021-05-06 16:39:01 +00:00
|
|
|
err = c.stopExpiration()
|
2021-04-29 15:12:02 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error stopping expiration manager: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
err = exp.Restore(nil)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error restoring expiration manager: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
loadedLE, err = exp.loadEntry(ctx, leaseID)
|
|
|
|
if err != nil {
|
2021-05-04 21:48:02 +00:00
|
|
|
t.Fatalf("error loading non irrevocable lease after restore: %v", err)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-11 20:04:06 +00:00
|
|
|
exp.updatePending(loadedLE)
|
2021-04-29 15:12:02 +00:00
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
if !loadedLE.isIrrevocable() {
|
|
|
|
t.Fatalf("irrevocable lease is not irrevocable and should be")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
if loadedLE.RevokeErr != irrevocableErr.Error() {
|
|
|
|
t.Errorf("irrevocable lease has wrong error message. expected %s, got %s", irrevocableErr.Error(), loadedLE.RevokeErr)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
if _, ok := exp.irrevocable.Load(leaseID); !ok {
|
|
|
|
t.Fatalf("irrevocable lease not included in irrevocable map")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
if _, ok := exp.pending.Load(leaseID); ok {
|
2021-05-04 21:48:02 +00:00
|
|
|
t.Fatalf("irrevocable lease included in pending map")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
if _, ok := exp.nonexpiring.Load(leaseID); ok {
|
2021-05-04 21:48:02 +00:00
|
|
|
t.Fatalf("irrevocable lease included in nonexpiring map")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
func TestExpiration_FetchLeaseTimesIrrevocable(t *testing.T) {
|
2021-04-29 15:12:02 +00:00
|
|
|
exp := mockExpiration(t)
|
|
|
|
ctx := namespace.RootContext(nil)
|
|
|
|
|
|
|
|
leaseID := registerOneLease(t, ctx, exp)
|
|
|
|
expectedLeaseTimes, err := exp.FetchLeaseTimes(ctx, leaseID)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error getting lease times: %v", err)
|
|
|
|
}
|
|
|
|
if expectedLeaseTimes == nil {
|
|
|
|
t.Fatal("got nil lease")
|
|
|
|
}
|
|
|
|
|
|
|
|
le, err := exp.loadEntry(ctx, leaseID)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error loading lease: %v", err)
|
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
exp.markLeaseIrrevocable(ctx, le, fmt.Errorf("test irrevocable error"))
|
2021-04-29 15:12:02 +00:00
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
irrevocableLeaseTimes, err := exp.FetchLeaseTimes(ctx, leaseID)
|
2021-04-29 15:12:02 +00:00
|
|
|
if err != nil {
|
2021-05-04 21:48:02 +00:00
|
|
|
t.Fatalf("error getting irrevocable lease times: %v", err)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
if irrevocableLeaseTimes == nil {
|
|
|
|
t.Fatal("got nil irrevocable lease")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// strip monotonic clock reading
|
|
|
|
expectedLeaseTimes.IssueTime = expectedLeaseTimes.IssueTime.Round(0)
|
|
|
|
expectedLeaseTimes.ExpireTime = expectedLeaseTimes.ExpireTime.Round(0)
|
|
|
|
expectedLeaseTimes.LastRenewalTime = expectedLeaseTimes.LastRenewalTime.Round(0)
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
if !irrevocableLeaseTimes.IssueTime.Equal(expectedLeaseTimes.IssueTime) {
|
|
|
|
t.Errorf("bad issue time. expected %v, got %v", expectedLeaseTimes.IssueTime, irrevocableLeaseTimes.IssueTime)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
if !irrevocableLeaseTimes.ExpireTime.Equal(expectedLeaseTimes.ExpireTime) {
|
|
|
|
t.Errorf("bad expire time. expected %v, got %v", expectedLeaseTimes.ExpireTime, irrevocableLeaseTimes.ExpireTime)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
2021-05-04 21:48:02 +00:00
|
|
|
if !irrevocableLeaseTimes.LastRenewalTime.Equal(expectedLeaseTimes.LastRenewalTime) {
|
|
|
|
t.Errorf("bad last renew time. expected %v, got %v", expectedLeaseTimes.LastRenewalTime, irrevocableLeaseTimes.LastRenewalTime)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
func TestExpiration_StopClearsIrrevocableCache(t *testing.T) {
|
2021-05-06 16:39:01 +00:00
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
exp := c.expiration
|
2021-04-29 15:12:02 +00:00
|
|
|
ctx := namespace.RootContext(nil)
|
|
|
|
|
|
|
|
leaseID := registerOneLease(t, ctx, exp)
|
|
|
|
le, err := exp.loadEntry(ctx, leaseID)
|
|
|
|
if err != nil {
|
2021-05-04 21:48:02 +00:00
|
|
|
t.Fatalf("error loading non irrevocable lease: %v", err)
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
exp.markLeaseIrrevocable(ctx, le, fmt.Errorf("test irrevocable error"))
|
2021-05-06 16:39:01 +00:00
|
|
|
err = c.stopExpiration()
|
2021-04-29 15:12:02 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error stopping expiration manager: %v", err)
|
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
if _, ok := exp.irrevocable.Load(leaseID); ok {
|
|
|
|
t.Error("expiration manager irrevocable cache should be cleared on stop")
|
2021-04-29 15:12:02 +00:00
|
|
|
}
|
|
|
|
}
|
2021-05-03 23:56:06 +00:00
|
|
|
|
|
|
|
func TestExpiration_errorIsUnrecoverable(t *testing.T) {
|
|
|
|
testCases := []struct {
|
|
|
|
err error
|
|
|
|
isUnrecoverable bool
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
err: logical.ErrUnrecoverable,
|
|
|
|
isUnrecoverable: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
err: logical.ErrUnsupportedOperation,
|
|
|
|
isUnrecoverable: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
err: logical.ErrUnsupportedPath,
|
|
|
|
isUnrecoverable: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
err: logical.ErrInvalidRequest,
|
|
|
|
isUnrecoverable: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
err: logical.ErrPermissionDenied,
|
|
|
|
isUnrecoverable: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
err: logical.ErrMultiAuthzPending,
|
|
|
|
isUnrecoverable: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
err: fmt.Errorf("some other error"),
|
|
|
|
isUnrecoverable: false,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range testCases {
|
|
|
|
out := errIsUnrecoverable(tc.err)
|
|
|
|
if out != tc.isUnrecoverable {
|
|
|
|
t.Errorf("wrong answer: expected %t, got %t", tc.isUnrecoverable, out)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
func TestExpiration_unrecoverableErrorMakesIrrevocable(t *testing.T) {
|
2021-05-03 23:56:06 +00:00
|
|
|
exp := mockExpiration(t)
|
|
|
|
ctx := namespace.RootContext(nil)
|
|
|
|
|
|
|
|
makeJob := func() *revocationJob {
|
|
|
|
leaseID := registerOneLease(t, ctx, exp)
|
|
|
|
|
|
|
|
job, err := newRevocationJob(ctx, leaseID, namespace.RootNamespace, exp)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err making revocation job: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return job
|
|
|
|
}
|
|
|
|
|
|
|
|
testCases := []struct {
|
2021-05-04 21:48:02 +00:00
|
|
|
err error
|
|
|
|
job *revocationJob
|
|
|
|
shouldBeIrrevocable bool
|
2021-05-03 23:56:06 +00:00
|
|
|
}{
|
|
|
|
{
|
2021-05-04 21:48:02 +00:00
|
|
|
err: logical.ErrUnrecoverable,
|
|
|
|
job: makeJob(),
|
|
|
|
shouldBeIrrevocable: true,
|
2021-05-03 23:56:06 +00:00
|
|
|
},
|
|
|
|
{
|
2021-05-04 21:48:02 +00:00
|
|
|
err: logical.ErrInvalidRequest,
|
|
|
|
job: makeJob(),
|
|
|
|
shouldBeIrrevocable: true,
|
2021-05-03 23:56:06 +00:00
|
|
|
},
|
|
|
|
{
|
2021-05-04 21:48:02 +00:00
|
|
|
err: logical.ErrPermissionDenied,
|
|
|
|
job: makeJob(),
|
|
|
|
shouldBeIrrevocable: false,
|
2021-05-03 23:56:06 +00:00
|
|
|
},
|
|
|
|
{
|
2021-05-04 21:48:02 +00:00
|
|
|
err: logical.ErrRateLimitQuotaExceeded,
|
|
|
|
job: makeJob(),
|
|
|
|
shouldBeIrrevocable: false,
|
2021-05-03 23:56:06 +00:00
|
|
|
},
|
|
|
|
{
|
2021-05-04 21:48:02 +00:00
|
|
|
err: fmt.Errorf("some random recoverable error"),
|
|
|
|
job: makeJob(),
|
|
|
|
shouldBeIrrevocable: false,
|
2021-05-03 23:56:06 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range testCases {
|
|
|
|
tc.job.OnFailure(tc.err)
|
|
|
|
|
|
|
|
le, err := exp.loadEntry(ctx, tc.job.leaseID)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("could not load leaseID %q: %v", tc.job.leaseID, err)
|
|
|
|
}
|
|
|
|
if le == nil {
|
|
|
|
t.Fatalf("nil lease for leaseID: %q", tc.job.leaseID)
|
|
|
|
}
|
|
|
|
|
2021-05-04 21:48:02 +00:00
|
|
|
isIrrevocable := le.isIrrevocable()
|
|
|
|
if isIrrevocable != tc.shouldBeIrrevocable {
|
|
|
|
t.Errorf("expected irrevocable: %t, got irrevocable: %t", tc.shouldBeIrrevocable, isIrrevocable)
|
2021-05-03 23:56:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-06-02 16:11:30 +00:00
|
|
|
|
|
|
|
func TestExpiration_getIrrevocableLeaseCounts(t *testing.T) {
|
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
|
2021-06-04 19:25:41 +00:00
|
|
|
backends := []*backend{
|
|
|
|
{
|
|
|
|
path: "foo/bar/1/",
|
|
|
|
ns: namespace.RootNamespace,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
path: "foo/bar/2/",
|
|
|
|
ns: namespace.RootNamespace,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
path: "foo/bar/3/",
|
|
|
|
ns: namespace.RootNamespace,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
pathToMount := mountNoopBackends(t, c, backends)
|
2021-06-02 16:11:30 +00:00
|
|
|
|
|
|
|
exp := c.expiration
|
|
|
|
|
|
|
|
expectedPerMount := 10
|
|
|
|
for i := 0; i < expectedPerMount; i++ {
|
2021-06-04 19:25:41 +00:00
|
|
|
for _, backend := range backends {
|
|
|
|
addIrrevocableLease(t, exp, backend.path, namespace.RootNamespace)
|
2021-06-02 16:11:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out, err := exp.getIrrevocableLeaseCounts(namespace.RootContext(nil), false)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error getting irrevocable lease counts: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
countRaw, ok := out["lease_count"]
|
|
|
|
if !ok {
|
|
|
|
t.Fatal("no lease count")
|
|
|
|
}
|
|
|
|
|
|
|
|
countPerMountRaw, ok := out["counts"]
|
|
|
|
if !ok {
|
|
|
|
t.Fatal("no count per mount")
|
|
|
|
}
|
|
|
|
|
|
|
|
count := countRaw.(int)
|
|
|
|
countPerMount := countPerMountRaw.(map[string]int)
|
|
|
|
|
2021-06-04 19:25:41 +00:00
|
|
|
expectedCount := len(backends) * expectedPerMount
|
2021-06-02 16:11:30 +00:00
|
|
|
if count != expectedCount {
|
|
|
|
t.Errorf("bad count. expected %d, got %d", expectedCount, count)
|
|
|
|
}
|
|
|
|
|
2021-06-04 19:25:41 +00:00
|
|
|
if len(countPerMount) != len(backends) {
|
|
|
|
t.Fatalf("bad mounts. got %#v, expected %#v", countPerMount, backends)
|
2021-06-02 16:11:30 +00:00
|
|
|
}
|
|
|
|
|
2021-06-04 19:25:41 +00:00
|
|
|
for _, backend := range backends {
|
|
|
|
mountCount := countPerMount[pathToMount[backend.path]]
|
2021-06-02 16:11:30 +00:00
|
|
|
if mountCount != expectedPerMount {
|
2021-06-04 19:25:41 +00:00
|
|
|
t.Errorf("bad count for prefix %q. expected %d, got %d", backend.path, expectedPerMount, mountCount)
|
2021-06-02 16:11:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_listIrrevocableLeases(t *testing.T) {
|
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
|
2021-06-04 19:25:41 +00:00
|
|
|
backends := []*backend{
|
|
|
|
{
|
|
|
|
path: "foo/bar/1/",
|
|
|
|
ns: namespace.RootNamespace,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
path: "foo/bar/2/",
|
|
|
|
ns: namespace.RootNamespace,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
path: "foo/bar/3/",
|
|
|
|
ns: namespace.RootNamespace,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
pathToMount := mountNoopBackends(t, c, backends)
|
2021-06-02 16:11:30 +00:00
|
|
|
|
|
|
|
exp := c.expiration
|
|
|
|
|
|
|
|
expectedLeases := make([]*basicLeaseTestInfo, 0)
|
|
|
|
expectedPerMount := 10
|
|
|
|
for i := 0; i < expectedPerMount; i++ {
|
2021-06-04 19:25:41 +00:00
|
|
|
for _, backend := range backends {
|
|
|
|
le := addIrrevocableLease(t, exp, backend.path, namespace.RootNamespace)
|
2021-06-02 16:11:30 +00:00
|
|
|
expectedLeases = append(expectedLeases, &basicLeaseTestInfo{
|
|
|
|
id: le.id,
|
2021-06-04 19:25:41 +00:00
|
|
|
mount: pathToMount[backend.path],
|
2021-06-02 16:11:30 +00:00
|
|
|
expire: le.expire,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out, warn, err := exp.listIrrevocableLeases(namespace.RootContext(nil), false, false, MaxIrrevocableLeasesToReturn)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("error listing irrevocable leases: %v", err)
|
|
|
|
}
|
|
|
|
if warn != "" {
|
|
|
|
t.Errorf("expected no warning, got %q", warn)
|
|
|
|
}
|
|
|
|
|
|
|
|
countRaw, ok := out["lease_count"]
|
|
|
|
if !ok {
|
|
|
|
t.Fatal("no lease count")
|
|
|
|
}
|
|
|
|
|
|
|
|
leasesRaw, ok := out["leases"]
|
|
|
|
if !ok {
|
|
|
|
t.Fatal("no leases")
|
|
|
|
}
|
|
|
|
|
|
|
|
count := countRaw.(int)
|
|
|
|
leases := leasesRaw.([]*leaseResponse)
|
|
|
|
|
2021-06-04 19:25:41 +00:00
|
|
|
expectedCount := len(backends) * expectedPerMount
|
2021-06-02 16:11:30 +00:00
|
|
|
if count != expectedCount {
|
|
|
|
t.Errorf("bad count. expected %d, got %d", expectedCount, count)
|
|
|
|
}
|
|
|
|
if len(leases) != len(expectedLeases) {
|
|
|
|
t.Errorf("bad lease results. expected %d, got %d with values %v", len(expectedLeases), len(leases), leases)
|
|
|
|
}
|
|
|
|
|
|
|
|
// `leases` is already sorted by lease ID
|
|
|
|
sort.Slice(expectedLeases, func(i, j int) bool {
|
|
|
|
return expectedLeases[i].id < expectedLeases[j].id
|
|
|
|
})
|
|
|
|
sort.SliceStable(expectedLeases, func(i, j int) bool {
|
|
|
|
return expectedLeases[i].expire.Before(expectedLeases[j].expire)
|
|
|
|
})
|
|
|
|
|
|
|
|
for i, lease := range expectedLeases {
|
|
|
|
if lease.id != leases[i].LeaseID {
|
|
|
|
t.Errorf("bad lease id. expected %q, got %q", lease.id, leases[i].LeaseID)
|
|
|
|
}
|
|
|
|
if lease.mount != leases[i].MountID {
|
|
|
|
t.Errorf("bad mount id. expected %q, got %q", lease.mount, leases[i].MountID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestExpiration_listIrrevocableLeases_includeAll(t *testing.T) {
|
|
|
|
c, _, _ := TestCoreUnsealed(t)
|
|
|
|
exp := c.expiration
|
|
|
|
|
|
|
|
expectedNumLeases := MaxIrrevocableLeasesToReturn + 10
|
|
|
|
for i := 0; i < expectedNumLeases; i++ {
|
|
|
|
addIrrevocableLease(t, exp, "foo/", namespace.RootNamespace)
|
|
|
|
}
|
|
|
|
|
|
|
|
dataRaw, warn, err := exp.listIrrevocableLeases(namespace.RootContext(nil), false, false, MaxIrrevocableLeasesToReturn)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("expected no error, got: %v", err)
|
|
|
|
}
|
|
|
|
if warn != MaxIrrevocableLeasesWarning {
|
|
|
|
t.Errorf("expected warning %q, got %q", MaxIrrevocableLeasesWarning, warn)
|
|
|
|
}
|
|
|
|
if dataRaw == nil {
|
|
|
|
t.Fatal("expected partial data, got nil")
|
|
|
|
}
|
|
|
|
|
|
|
|
leaseListLength := len(dataRaw["leases"].([]*leaseResponse))
|
|
|
|
if leaseListLength != MaxIrrevocableLeasesToReturn {
|
|
|
|
t.Fatalf("expected %d results, got %d", MaxIrrevocableLeasesToReturn, leaseListLength)
|
|
|
|
}
|
|
|
|
|
|
|
|
dataRaw, warn, err = exp.listIrrevocableLeases(namespace.RootContext(nil), false, true, 0)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("got error when using limit=none: %v", err)
|
|
|
|
}
|
|
|
|
if warn != "" {
|
|
|
|
t.Errorf("expected no warning, got %q", warn)
|
|
|
|
}
|
|
|
|
if dataRaw == nil {
|
|
|
|
t.Fatalf("got nil data when using limit=none")
|
|
|
|
}
|
|
|
|
|
|
|
|
leaseListLength = len(dataRaw["leases"].([]*leaseResponse))
|
|
|
|
if leaseListLength != expectedNumLeases {
|
|
|
|
t.Fatalf("expected %d results, got %d", MaxIrrevocableLeasesToReturn, expectedNumLeases)
|
|
|
|
}
|
|
|
|
|
|
|
|
numLeasesRaw, ok := dataRaw["lease_count"]
|
|
|
|
if !ok {
|
|
|
|
t.Fatalf("lease count data not present")
|
|
|
|
}
|
|
|
|
if numLeasesRaw == nil {
|
|
|
|
t.Fatalf("nil lease count")
|
|
|
|
}
|
|
|
|
|
|
|
|
numLeases := numLeasesRaw.(int)
|
|
|
|
if numLeases != expectedNumLeases {
|
|
|
|
t.Errorf("bad lease count. expected %d, got %d", expectedNumLeases, numLeases)
|
|
|
|
}
|
|
|
|
}
|