Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #905 from rithujohn191/error-msg

Browse source 
server/rotation.go: avoid displaying the "keys already rotated" error
This commit is contained in:
rithu leena john 2017-04-11 14:17:22 -07:00 committed by GitHub
commit 9b0af83604
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/rotation.go
View file

@ -5,7 +5,6 @@ import (
"crypto/rand" "crypto/rand"
"crypto/rsa" "crypto/rsa"
"encoding/hex" "encoding/hex"
"errors"
"fmt" "fmt"
"io" "io"
"time" "time"
@ -125,8 +124,11 @@ func (k keyRotater) rotate() error {
var nextRotation time.Time var nextRotation time.Time
err = k.Storage.UpdateKeys(func(keys storage.Keys) (storage.Keys, error) { err = k.Storage.UpdateKeys(func(keys storage.Keys) (storage.Keys, error) {
tNow := k.now() tNow := k.now()
// if you are running multiple instances of dex, another instance
// could have already rotated the keys.
if tNow.Before(keys.NextRotation) { if tNow.Before(keys.NextRotation) {
return storage.Keys{}, errors.New("keys already rotated") return storage.Keys{}, nil
} }
expired := func(key storage.VerificationKey) bool { expired := func(key storage.VerificationKey) bool {