Replace string-based error matching with sentinel error
Introduced ErrHTTPChallengeRequired as a sentinel error and updated the renewal flow to use errors.Is() for type-safe error checking instead of string matching. Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
@@ -21,6 +21,7 @@ import (
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"crypto/x509/pkix"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"time"
|
||||
@@ -57,6 +58,10 @@ type (
|
||||
}
|
||||
)
|
||||
|
||||
// ErrHTTPChallengeRequired indicates that an HTTP-01 challenge needs to be
|
||||
// completed before the certificate can be issued or renewed.
|
||||
var ErrHTTPChallengeRequired = errors.New("HTTP challenge required")
|
||||
|
||||
func NewACMEService(email string, keyType keys.Type, directoryURL string, insecureTLS bool, logger *log.Logger) (*ACMEService, error) {
|
||||
accountKey, err := keys.Generate(keyType)
|
||||
if err != nil {
|
||||
@@ -229,7 +234,7 @@ func (s *ACMEService) ObtainCertificate(
|
||||
// The challenge token and key auth will be stored and served via HTTP
|
||||
// The caller is responsible for ensuring the HTTP endpoint is ready
|
||||
// before calling CompleteHTTPChallenge
|
||||
return nil, fmt.Errorf("HTTP challenge ready: token=%s", challenge.Token)
|
||||
return nil, fmt.Errorf("%w: token=%s", ErrHTTPChallengeRequired, challenge.Token)
|
||||
}
|
||||
|
||||
func (s *ACMEService) RenewCertificate(
|
||||
|
||||
@@ -16,8 +16,8 @@ package certmanager
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/getprobo/probo/pkg/coredata"
|
||||
@@ -146,7 +146,8 @@ func (r *Renewer) renewDomain(ctx context.Context, conn pg.Conn, domain *coredat
|
||||
}
|
||||
|
||||
cert, err := r.acmeService.RenewCertificate(ctx, lockedDomain.Domain)
|
||||
if err != nil && strings.Contains(err.Error(), "HTTP challenge ready") {
|
||||
if err != nil {
|
||||
if errors.Is(err, ErrHTTPChallengeRequired) {
|
||||
challenge, err := r.acmeService.GetHTTPChallenge(ctx, lockedDomain.Domain)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot get HTTP challenge for renewal: %w", err)
|
||||
@@ -172,7 +173,6 @@ func (r *Renewer) renewDomain(ctx context.Context, conn pg.Conn, domain *coredat
|
||||
return nil
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot renew certificate: %w", err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user