alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

acme: go fmt

Browse source
This commit is contained in:
David Cowden 2020-05-07 09:27:16 -07:00
parent 9af4dd3692
commit bdadea8a37
3 changed files with 35 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
acme/authority.go
View file

@ -62,7 +62,7 @@ var (
// Ordinal is used during challenge retries to indicate ownership. // Ordinal is used during challenge retries to indicate ownership.
func init() { func init() {
ordstr := os.Getenv("STEP_CA_ORDINAL"); ordstr := os.Getenv("STEP_CA_ORDINAL")
if ordstr == "" { if ordstr == "" {
ordinal = 0 ordinal = 0
} else { } else {
@ -329,7 +329,6 @@ func (a *Authority) ValidateChallenge(p provisioner.Interface, accID, chID strin
NumAttempts: 0, NumAttempts: 0,
MaxAttempts: 10, MaxAttempts: 10,
NextAttempt: time.Now().Add(retryInterval).UTC().Format(time.RFC3339), NextAttempt: time.Now().Add(retryInterval).UTC().Format(time.RFC3339),
} }
err = up.save(a.db, ch) err = up.save(a.db, ch)
if err != nil { if err != nil {
@ -382,7 +381,6 @@ func (a *Authority) validate(ch challenge, jwk *jose.JSONWebKey) (challenge, err
}) })
} }
const retryInterval = 12 * time.Second const retryInterval = 12 * time.Second
// see: ValidateChallenge // see: ValidateChallenge
@ -458,7 +456,6 @@ func (a *Authority) RetryChallenge(chID string) {
} }
} }
// GetCertificate retrieves the Certificate by ID. // GetCertificate retrieves the Certificate by ID.
func (a *Authority) GetCertificate(accID, certID string) ([]byte, error) { func (a *Authority) GetCertificate(accID, certID string) ([]byte, error) {
cert, err := getCert(a.db, certID) cert, err := getCert(a.db, certID)
@ -470,4 +467,3 @@ func (a *Authority) GetCertificate(accID, certID string) ([]byte, error) {
} }
return cert.toACME(a.db, a.dir) return cert.toACME(a.db, a.dir)
} }

2
acme/challenge.go
View file

@ -305,7 +305,6 @@ func (r *Retry) Active() bool {
return r.NumAttempts < r.MaxAttempts return r.NumAttempts < r.MaxAttempts
} }
// http01Challenge represents an http-01 acme challenge. // http01Challenge represents an http-01 acme challenge.
type http01Challenge struct { type http01Challenge struct {
*baseChallenge *baseChallenge
@ -630,4 +629,3 @@ func getChallenge(db nosql.DB, id string) (challenge, error) {
} }
return ch, nil return ch, nil
} }