weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Don't call GetReg before Register in registerAccount

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2020-03-06 19:18:39 +00:00
parent 4fd0a7a89f
commit 698d6ae5de
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/issuer/acme/setup.go
View File

@ -301,26 +301,21 @@ func ensureEmailUpToDate(ctx context.Context, cl client.Interface, acc *acmeapi.
// up and verify the corresponding account, and will return that. If this fails
// due to a not found error it will register a new account with the given key.
func (a *Acme) registerAccount(ctx context.Context, cl client.Interface, eabAccount *acmeapi.ExternalAccountBinding) (*acmeapi.Account, error) {
// check if the account already exists
acc, err := cl.GetReg(ctx, "")
if err == nil {
return acc, nil
}
if err != acmeapi.ErrNoAccount {
return nil, err
}
emailurl := []string(nil)
if a.issuer.GetSpec().ACME.Email != "" {
emailurl = []string{fmt.Sprintf("mailto:%s", strings.ToLower(a.issuer.GetSpec().ACME.Email))}
}
acc = &acmeapi.Account{
acc := &acmeapi.Account{
Contact: emailurl,
ExternalAccountBinding: eabAccount,
}
acc, err = cl.Register(ctx, acc, acmeapi.AcceptTOS)
acc, err := cl.Register(ctx, acc, acmeapi.AcceptTOS)
// If the account already exists, fetch the Account object and return.
if err == acmeapi.ErrAccountAlreadyExists {
return cl.GetReg(ctx, "")
}
if err != nil {
return nil, err
}