From a5602dd8cdec8cb8ce85cbc5fab29a91f533d2af Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sun, 28 Aug 2016 17:33:14 +0100 Subject: List only certs which haven't expired --- server/store/store_test.go | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'server/store/store_test.go') diff --git a/server/store/store_test.go b/server/store/store_test.go index 18fa0d1..3552d1c 100644 --- a/server/store/store_test.go +++ b/server/store/store_test.go @@ -42,27 +42,21 @@ func TestParseCertificate(t *testing.T) { func testStore(t *testing.T, db CertStorer) { defer db.Close() - ids := []string{"a", "b"} - for _, id := range ids { - r := &CertRecord{ - KeyID: id, - Expires: time.Now().UTC().Add(time.Second * -10), - } - if err := db.SetRecord(r); err != nil { - t.Error(err) - } + r := &CertRecord{ + KeyID: "a", + Expires: time.Now().UTC().Add(1 * time.Minute), } - recs, err := db.List() - if err != nil { + if err := db.SetRecord(r); err != nil { t.Error(err) } - if len(recs) != len(ids) { - t.Errorf("Want %d records, got %d", len(ids), len(recs)) + if _, err := db.List(); err != nil { + t.Error(err) } c, _, _, _, _ := ssh.ParseAuthorizedKey(testdata.Cert) cert := c.(*ssh.Certificate) cert.ValidBefore = uint64(time.Now().Add(1 * time.Hour).UTC().Unix()) + cert.ValidAfter = uint64(time.Now().Add(-5 * time.Minute).UTC().Unix()) if err := db.SetCert(cert); err != nil { t.Error(err) } @@ -74,9 +68,6 @@ func testStore(t *testing.T, db CertStorer) { t.Error(err) } - // A revoked key shouldn't get returned if it's already expired - db.Revoke("a") - revoked, err := db.GetRevoked() if err != nil { t.Error(err) -- cgit v1.2.3