From 2e7c8c2f521c9e50bb3aea4df16771c22fe70e58 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sat, 10 Sep 2016 20:14:20 +0100 Subject: Allow filtering results --- server/store/mem.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'server/store/mem.go') diff --git a/server/store/mem.go b/server/store/mem.go index 92167a9..e63d00a 100644 --- a/server/store/mem.go +++ b/server/store/mem.go @@ -34,14 +34,16 @@ func (ms *memoryStore) SetRecord(record *CertRecord) error { return nil } -func (ms *memoryStore) List() ([]*CertRecord, error) { +func (ms *memoryStore) List(includeExpired bool) ([]*CertRecord, error) { var records []*CertRecord ms.Lock() defer ms.Unlock() + for _, value := range ms.certs { - if value.Expires.After(time.Now().UTC()) { - records = append(records, value) + if !includeExpired && value.Expires.After(time.Now().UTC()) { + continue } + records = append(records, value) } return records, nil } @@ -58,11 +60,9 @@ func (ms *memoryStore) Revoke(id string) error { func (ms *memoryStore) GetRevoked() ([]*CertRecord, error) { var revoked []*CertRecord - all, _ := ms.List() + all, _ := ms.List(false) for _, r := range all { - if r.Revoked && time.Now().UTC().Unix() <= r.Expires.UTC().Unix() { - revoked = append(revoked, r) - } + revoked = append(revoked, r) } return revoked, nil } -- cgit v1.2.3