feat: improve PropagationWait function

go-acme · Oct 2, 2024 · 2972278 · 2972278
1 parent 56986ea
commit 2972278
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/challenge/dns01/precheck.go b/challenge/dns01/precheck.go
@@ -44,10 +44,15 @@ func RecursiveNSsPropagationRequirement() ChallengeOption {
  }
 }
 
-func PropagationWaitOnly(wait time.Duration) ChallengeOption {
+func PropagationWait(wait time.Duration, only bool) ChallengeOption {
  return WrapPreCheck(func(domain, fqdn, value string, check PreCheckFunc) (bool, error) {
  time.Sleep(wait)
- return true, nil
+
+ if only {
+ return true, nil
+ }
+
+ return check(fqdn, value)
  })
 }
 

diff --git a/cmd/setup_challenges.go b/cmd/setup_challenges.go
@@ -143,7 +143,9 @@ func setupDNS(ctx *cli.Context, client *lego.Client) error {
  dns01.DisableAuthoritativeNssPropagationRequirement()),
 
  dns01.CondOption(ctx.Duration(flgDNSPropagationWait) > 0,
- dns01.PropagationWaitOnly(wait)),
+ // TODO(ldez): inside the next major version we will use flgDNSDisableCP here.
+ // This will change the meaning of this flag to really disable all propagation checks.
+ dns01.PropagationWait(wait, true)),
 
  dns01.CondOption(ctx.Bool(flgDNSPropagationRNS),
  dns01.RecursiveNSsPropagationRequirement()),