Update Lego

vendor/github.com/xenolf/lego/providers/dns/exec/doc.go

@@ -1,42 +0,0 @@
-/*
-Package exec implements a manual DNS provider which runs a program for adding/removing the DNS record.
-
-The file name of the external program is specified in the environment variable `EXEC_PATH`.
-When it is run by lego, three command-line parameters are passed to it:
-The action ("present" or "cleanup"), the fully-qualified domain name, the value for the record and the TTL.
-
-For example, requesting a certificate for the domain 'foo.example.com' can be achieved by calling lego as follows:
-
-	EXEC_PATH=./update-dns.sh \
-		lego --dns exec \
-		--domains foo.example.com \
-		--email invalid@example.com run
-
-It will then call the program './update-dns.sh' with like this:
-
-	./update-dns.sh "present" "_acme-challenge.foo.example.com." "MsijOYZxqyjGnFGwhjrhfg-Xgbl5r68WPda0J9EgqqI" "120"
-
-The program then needs to make sure the record is inserted.
-When it returns an error via a non-zero exit code, lego aborts.
-
-When the record is to be removed again,
-the program is called with the first command-line parameter set to "cleanup" instead of "present".
-
-If you want to use the raw domain, token, and keyAuth values with your program, you can set `EXEC_MODE=RAW`:
-
-	EXEC_MODE=RAW \
-	EXEC_PATH=./update-dns.sh \
-		lego --dns exec \
-		--domains foo.example.com \
-		--email invalid@example.com run
-
-It will then call the program './update-dns.sh' like this:
-
-	./update-dns.sh "present" "foo.example.com." "--" "some-token" "KxAy-J3NwUmg9ZQuM-gP_Mq1nStaYSaP9tYQs5_-YsE.ksT-qywTd8058G-SHHWA3RAN72Pr0yWtPYmmY5UBpQ8"
-
-NOTE:
-The `--` is because the token MAY start with a `-`, and the called program may try and interpret a - as indicating a flag.
-In the case of urfave, which is commonly used,
-you can use the `--` delimiter to specify the start of positional arguments, and handle such a string safely.
-*/
-package exec

vendor/github.com/xenolf/lego/providers/dns/exec/exec.go

@@ -1,3 +1,4 @@
+// Package exec implements a DNS provider which runs a program for adding/removing the DNS record.
 package exec
 
 import (
@@ -5,17 +6,27 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"strconv"
+	"time"
 
-	"github.com/xenolf/lego/acme"
+	"github.com/xenolf/lego/challenge/dns01"
 	"github.com/xenolf/lego/log"
 	"github.com/xenolf/lego/platform/config/env"
 )
 
 // Config Provider configuration.
 type Config struct {
-	Program string
-	Mode    string
+	Program            string
+	Mode               string
+	PropagationTimeout time.Duration
+	PollingInterval    time.Duration
+}
+
+// NewDefaultConfig returns a default configuration for the DNSProvider
+func NewDefaultConfig() *Config {
+	return &Config{
+		PropagationTimeout: env.GetOrDefaultSecond("EXEC_PROPAGATION_TIMEOUT", dns01.DefaultPropagationTimeout),
+		PollingInterval:    env.GetOrDefaultSecond("EXEC_POLLING_INTERVAL", dns01.DefaultPollingInterval),
+	}
 }
 
 // DNSProvider adds and removes the record for the DNS challenge by calling a
@@ -32,10 +43,11 @@ func NewDNSProvider() (*DNSProvider, error) {
 		return nil, fmt.Errorf("exec: %v", err)
 	}
 
-	return NewDNSProviderConfig(&Config{
-		Program: values["EXEC_PATH"],
-		Mode:    os.Getenv("EXEC_MODE"),
-	})
+	config := NewDefaultConfig()
+	config.Program = values["EXEC_PATH"]
+	config.Mode = os.Getenv("EXEC_MODE")
+
+	return NewDNSProviderConfig(config)
 }
 
 // NewDNSProviderConfig returns a new DNS provider which runs the given configuration
@@ -48,25 +60,14 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
 	return &DNSProvider{config: config}, nil
 }
 
-// NewDNSProviderProgram returns a new DNS provider which runs the given program
-// for adding and removing the DNS record.
-// Deprecated: use NewDNSProviderConfig instead
-func NewDNSProviderProgram(program string) (*DNSProvider, error) {
-	if len(program) == 0 {
-		return nil, errors.New("the program is undefined")
-	}
-
-	return NewDNSProviderConfig(&Config{Program: program})
-}
-
 // Present creates a TXT record to fulfill the dns-01 challenge.
 func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 	var args []string
 	if d.config.Mode == "RAW" {
 		args = []string{"present", "--", domain, token, keyAuth}
 	} else {
-		fqdn, value, ttl := acme.DNS01Record(domain, keyAuth)
-		args = []string{"present", fqdn, value, strconv.Itoa(ttl)}
+		fqdn, value := dns01.GetRecord(domain, keyAuth)
+		args = []string{"present", fqdn, value}
 	}
 
 	cmd := exec.Command(d.config.Program, args...)
@@ -85,8 +86,8 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 	if d.config.Mode == "RAW" {
 		args = []string{"cleanup", "--", domain, token, keyAuth}
 	} else {
-		fqdn, value, ttl := acme.DNS01Record(domain, keyAuth)
-		args = []string{"cleanup", fqdn, value, strconv.Itoa(ttl)}
+		fqdn, value := dns01.GetRecord(domain, keyAuth)
+		args = []string{"cleanup", fqdn, value}
 	}
 
 	cmd := exec.Command(d.config.Program, args...)
@@ -98,3 +99,9 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 
 	return err
 }
+
+// Timeout returns the timeout and interval to use when checking for DNS propagation.
+// Adjusting here to cope with spikes in propagation times.
+func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
+	return d.config.PropagationTimeout, d.config.PollingInterval
+}