luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix the token counter test so it doesn't miscount the number of tokens. (#7760)

This commit is contained in:
Mike Jarmy 2019-10-30 08:03:03 -04:00 committed by GitHub
parent 5b8a4ba5b8
commit d3bb5d60b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vault/counters_test.go
View File

@ -123,7 +123,7 @@ func TestRequestCounterSaveCurrent(t *testing.T) {
} }
} }
func testCountActiveTokens(t *testing.T, c *Core, root string, expectedServiceTokens int) { func testCountActiveTokens(t *testing.T, c *Core, root string) int {
t.Helper() t.Helper()
rootCtx := namespace.RootContext(nil) rootCtx := namespace.RootContext(nil)
@ -136,15 +136,8 @@ func testCountActiveTokens(t *testing.T, c *Core, root string, expectedServiceTo
t.Fatalf("bad: resp: %#v\n err: %v", resp, err) t.Fatalf("bad: resp: %#v\n err: %v", resp, err)
} }
if diff := deep.Equal(resp.Data, map[string]interface{}{ activeTokens := resp.Data["counters"].(*ActiveTokens)
"counters": &ActiveTokens{ return activeTokens.ServiceTokens.Total
ServiceTokens: TokenCounter{
Total: expectedServiceTokens,
},
},
}); diff != nil {
t.Fatal(diff)
}
} }
func TestTokenStore_CountActiveTokens(t *testing.T) { func TestTokenStore_CountActiveTokens(t *testing.T) {
@ -152,7 +145,10 @@ func TestTokenStore_CountActiveTokens(t *testing.T) {
rootCtx := namespace.RootContext(nil) rootCtx := namespace.RootContext(nil)
// Count the root token // Count the root token
testCountActiveTokens(t, c, root, 1) count := testCountActiveTokens(t, c, root)
if count != 1 {
t.Fatalf("expected %d tokens, not %d", 1, count)
}
// Create some service tokens // Create some service tokens
req := &logical.Request{ req := &logical.Request{
@ -171,7 +167,10 @@ func TestTokenStore_CountActiveTokens(t *testing.T) {
} }
tokens[i] = resp.Auth.ClientToken tokens[i] = resp.Auth.ClientToken
testCountActiveTokens(t, c, root, i+2) count = testCountActiveTokens(t, c, root)
if count != i+2 {
t.Fatalf("expected %d tokens, not %d", i+2, count)
}
} }
// Revoke the service tokens // Revoke the service tokens
@ -183,9 +182,20 @@ func TestTokenStore_CountActiveTokens(t *testing.T) {
if err != nil || (resp != nil && resp.IsError()) { if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("bad: resp: %#v\n err: %v", resp, err) t.Fatalf("bad: resp: %#v\n err: %v", resp, err)
} }
testCountActiveTokens(t, c, root, 10-i)
} }
// We should now have only 1 token (the root token). However, because
// token deletion works by setting the TTL of the token to 0 and waiting
// for it to get cleaned up by the expiration manager, occasionally we will
// have to wait briefly for all the tokens to actually get deleted.
for i := 0; i < 10; i++ {
count = testCountActiveTokens(t, c, root)
if count == 1 {
return
}
time.Sleep(time.Second)
}
t.Fatalf("expected %d tokens, not %d", 1, count)
} }
func testCountActiveEntities(t *testing.T, c *Core, root string, expectedEntities int) { func testCountActiveEntities(t *testing.T, c *Core, root string, expectedEntities int) {