From f63cef91d46f8186706f769fc4d1ab0137b734c5 Mon Sep 17 00:00:00 2001 From: lordwelch Date: Fri, 7 Aug 2020 14:38:49 -0700 Subject: [PATCH] Use time utilities --- internal/sshrimpagent/sshrimpagent.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/sshrimpagent/sshrimpagent.go b/internal/sshrimpagent/sshrimpagent.go index 9a8e19d..3bd14ac 100644 --- a/internal/sshrimpagent/sshrimpagent.go +++ b/internal/sshrimpagent/sshrimpagent.go @@ -70,11 +70,9 @@ func (r *sshrimpAgent) Unlock(passphrase []byte) error { // List returns the identities, but also signs the certificate using sshrimp-ca if expired. func (r *sshrimpAgent) List() ([]*agent.Key, error) { Log.Traceln("Listing current identities") + validEndDate := time.Unix(int64(r.certificate.ValidBefore), 0) - unixNow := time.Now().Unix() - before := int64(r.certificate.ValidBefore) - if r.certificate.ValidBefore != uint64(ssh.CertTimeInfinity) && (unixNow >= before || before < 0) { - // Certificate has expired + if r.certificate.ValidBefore != uint64(ssh.CertTimeInfinity) && (time.Now().After(validEndDate) || validEndDate.Unix() < 0) { Log.Traceln("Certificate has expired") Log.Traceln("authenticating token") err := r.providerConfig.Authenticate(r.token)