Module updates

go.mod

@@ -1,8 +1,16 @@
 module github.com/acme-dns/acme-dns-client
 
-go 1.15
+go 1.24
 
 require (
-	github.com/cpu/goacmedns v0.1.1
-	github.com/miekg/dns v1.1.35
+	github.com/miekg/dns v1.1.67
+	github.com/nrdcg/goacmedns v0.2.0
+)
+
+require (
+	golang.org/x/mod v0.25.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/sync v0.15.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/tools v0.34.0 // indirect
 )

go.sum

@@ -1,21 +1,16 @@
-github.com/cpu/goacmedns v0.1.1 h1:DM3H2NiN2oam7QljgGY5ygy4yDXhK5Z4JUnqaugs2C4=
-github.com/cpu/goacmedns v0.1.1/go.mod h1:MuaouqEhPAHxsbqjgnck5zeghuwBP1dLnPoobeGqugQ=
-github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
-github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/miekg/dns v1.1.67 h1:kg0EHj0G4bfT5/oOys6HhZw4vmMlnoZ+gDu8tJ/AlI0=
+github.com/miekg/dns v1.1.67/go.mod h1:fujopn7TB3Pu3JM69XaawiU0wqjpL9/8xGop5UrTPps=
+github.com/nrdcg/goacmedns v0.2.0 h1:ADMbThobzEMnr6kg2ohs4KGa3LFqmgiBA22/6jUWJR0=
+github.com/nrdcg/goacmedns v0.2.0/go.mod h1:T5o6+xvSLrQpugmwHvrSNkzWht0UGAwj2ACBMhh73Cg=
+golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
+golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=

pkg/client/check.go

@@ -1,12 +1,14 @@
 package client
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
 	"github.com/acme-dns/acme-dns-client/pkg/dnsclient"
 
-	"github.com/cpu/goacmedns"
+	"github.com/nrdcg/goacmedns/storage"
+	"github.com/nrdcg/goacmedns"
 )
 
 type ConfigurationState struct {
@@ -35,8 +37,13 @@ func (c *AcmednsClient) CheckAndPrint() {
 		}
 	} else {
 		// Fetch all domains from storage
-		for d, _ := range c.Storage.FetchAll() {
-			domains = append(domains, d)
+		fetched, err := c.Storage.FetchAll(context.Background())
+		if err != nil {
+			c.Verbose(fmt.Sprintf("%s", err))
+		} else {
+			for d, _ := range fetched {
+				domains = append(domains, d)
+			}
 		}
 	}
 	for _, d := range domains {
@@ -73,10 +80,10 @@ func (c *AcmednsClient) ConfigurationState(domain string) ConfigurationState {
 // acmeDnsAccountForDomain returns a preconfigured `goacmedns.Account` for a domain or
 // a fresh `goacmedns.Account` object if not found.
 func (c *AcmednsClient) acmeDnsAccountForDomain(domain string) (goacmedns.Account, error) {
-	adnsacct, err := c.Storage.Fetch(domain)
-	if err != nil && err != goacmedns.ErrDomainNotFound{
+	adnsacct, err := c.Storage.Fetch(context.Background(), domain)
+	if err != nil && err != storage.ErrDomainNotFound{
 		return goacmedns.Account{}, err
-	} else if err == goacmedns.ErrDomainNotFound {
+	} else if err == storage.ErrDomainNotFound {
 		return goacmedns.Account{}, nil
 	}
 	return adnsacct, err

pkg/client/client.go

@@ -1,6 +1,9 @@
 package client
 
-import "github.com/cpu/goacmedns"
+import (
+	"github.com/nrdcg/goacmedns"
+	"github.com/nrdcg/goacmedns/storage"
+)
 
 type AcmednsClient struct {
 	Config *Config
@@ -30,7 +33,7 @@ func NewAcmednsConfig() *Config {
 func NewAcmednsClient(storagepath string) *AcmednsClient {
 	return &AcmednsClient{
 		Config: NewAcmednsConfig(),
-		Storage: goacmedns.NewFileStorage(storagepath, 0600),
+		Storage: storage.NewFile(storagepath, 0600),
 	}
 }
 
@@ -44,4 +47,4 @@ func (c *AcmednsClient) Verbose(input string) {
 	if c.Config.Verbose || c.Config.Debug {
 		PrintDebug(input, 0)
 	}
-}
+}

pkg/client/list.go

@@ -1,32 +1,38 @@
 package client
 
 import (
+	"context"
 	"fmt"
 	"github.com/acme-dns/acme-dns-client/pkg/dnsclient"
 )
 
 func (c *AcmednsClient) List() {
-	adnsAccts := c.Storage.FetchAll()
 	functional := make([]string, 0)
 	dysfunctional := make([]string, 0)
 	errored := make([]string, 0)
 
-	if len(adnsAccts) == 0 {
-		fmt.Printf("No acme-dns accounts were found on this system.\n")
+	adnsAccts, err := c.Storage.FetchAll(context.Background())
+	if err != nil {
+		errored = append(errored, fmt.Sprintf("all domains (%s)", err))
 	} else {
-		fmt.Printf("Number of acme-dns accounts found on this system: %d\nPerforming CNAME checks...\n\n", len(adnsAccts))
-		for d, acct := range adnsAccts {
-			dnsc := dnsclient.NewDNSClient(c.Config.DNSServer)
-			cname, err := dnsc.GetCNAME(d)
-			if err != nil {
-				errored = append(errored, fmt.Sprintf("%s (%s)", d, err))
-			} else if cname.CorrectTarget(acct.FullDomain) {
-				functional = append(functional, d)
-			} else {
-				dysfunctional = append(dysfunctional, d)
+		if len(adnsAccts) == 0 {
+			fmt.Printf("No acme-dns accounts were found on this system.\n")
+		} else {
+			fmt.Printf("Number of acme-dns accounts found on this system: %d\nPerforming CNAME checks...\n\n", len(adnsAccts))
+			for d, acct := range adnsAccts {
+				dnsc := dnsclient.NewDNSClient(c.Config.DNSServer)
+				cname, err := dnsc.GetCNAME(d)
+				if err != nil {
+					errored = append(errored, fmt.Sprintf("%s (%s)", d, err))
+				} else if cname.CorrectTarget(acct.FullDomain) {
+					functional = append(functional, d)
+				} else {
+					dysfunctional = append(dysfunctional, d)
+				}
 			}
 		}
 	}
+
 	if len(functional) > 0 {
 		fmt.Printf("Working:\n")
 		for _, s := range functional {

pkg/client/register.go

@@ -1,11 +1,12 @@
 package client
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"strings"
 
-	"github.com/cpu/goacmedns"
+	"github.com/nrdcg/goacmedns"
 )
 
 const PUBLIC_ACME_DNS = "https://auth.acme-dns.io"
@@ -49,6 +50,8 @@ they're not enabled in the production yet. It is still be worthwhile to configur
 )
 
 func (c *AcmednsClient) Register() {
+	ctx := context.Background()
+
 	cstate := c.ConfigurationState(c.Config.Domain)
 	if !c.Config.Dangerous && c.Config.Server == PUBLIC_ACME_DNS && !cstate.HasAcmednsAccount() {
 		PrintWarning(fmt.Sprintf(PUBLIC_INSTANCE_WARNING), 0)
@@ -76,7 +79,11 @@ func (c *AcmednsClient) Register() {
 	}
 
 	c.Debug("Initializing goacmedns client")
-	client := goacmedns.NewClient(c.Config.Server)
+	client, err := goacmedns.NewClient(c.Config.Server)
+	if err != nil {
+		PrintError("Failed to initalize goacmedns client: " + err.Error(), 0)
+		os.Exit(1)
+	}
 
 	c.Debug("Trying to fetch existing account for the domain from storage")
 	if cstate.HasAcmednsAccount() {
@@ -89,22 +96,22 @@ func (c *AcmednsClient) Register() {
 			allowFrom = strings.Split(c.Config.AllowList, ",")
 		}
 		c.Debug("Registering new account with the acme-dns server")
-		newAccount, err := client.RegisterAccount(allowFrom)
+		newAccount, err := client.RegisterAccount(ctx, allowFrom)
 		if err != nil {
 			PrintError(fmt.Sprintf("%s", err), 0)
 			return
 		}
 
 		cstate.Account = newAccount
 		c.Debug("Adding the registered acme-dns account to storage state")
-		err = c.Storage.Put(c.Config.Domain, cstate.Account)
+		err = c.Storage.Put(ctx, c.Config.Domain, cstate.Account)
 		if err != nil {
 			PrintError(fmt.Sprintf("%s", err), 0)
 			return
 		}
 
 		c.Debug("Saving the acme-dns account storage to disk")
-		err = c.Storage.Save()
+		err = c.Storage.Save(ctx)
 		if err != nil {
 			PrintError(fmt.Sprintf("%s", err), 0)
 			return

pkg/client/validation.go

@@ -1,31 +1,35 @@
 package client
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/acme-dns/acme-dns-client/pkg/integration"
 
-	"github.com/cpu/goacmedns"
+	"github.com/nrdcg/goacmedns"
+	"github.com/nrdcg/goacmedns/storage"
 )
 
 func (c *AcmednsClient) Validation() bool {
+	ctx := context.Background()
+
 	token := c.FindValidationToken()
 	c.Debug(fmt.Sprintf("Got validation token: %s", token))
 	domain := c.FindValidationDomain()
 	c.Debug(fmt.Sprintf("Got validation domain: %s", domain))
 	if domain == "" || token == "" {
 		return false
 	}
-	acct, err := c.Storage.Fetch(domain)
-	if err != nil && err != goacmedns.ErrDomainNotFound {
+	acct, err := c.Storage.Fetch(ctx, domain)
+	if err != nil && err != storage.ErrDomainNotFound {
 		PrintError(fmt.Sprintf("Validation failed: %s", err), 0)
 		return false
-	} else if err == goacmedns.ErrDomainNotFound {
+	} else if err == storage.ErrDomainNotFound {
 		PrintError(fmt.Sprintf("Domain %s does not have acme-dns account registered for it. Validation failed.", domain),0)
 		return false
 	}
-	client := goacmedns.NewClient(acct.ServerURL)
-	err = client.UpdateTXTRecord(acct, token)
+	client, err := goacmedns.NewClient(acct.ServerURL)
+	err = client.UpdateTXTRecord(ctx, acct, token)
 	if err != nil {
 		PrintError(fmt.Sprintf("Validation failed: %s", err), 0)
 		return false

pkg/client/wizard.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"fmt"
 	"github.com/acme-dns/acme-dns-client/pkg/dnsclient"
 	"github.com/acme-dns/acme-dns-client/pkg/integration"
@@ -27,7 +28,7 @@ example CAA record below accordingly and add it to your DNS zone:
 
 func (c *AcmednsClient) CNAMESetupWizard(domain string) bool {
 	c.Debug("Trying to fetch existing account for the domain from storage")
-	acct, err := c.Storage.Fetch(c.Config.Domain)
+	acct, err := c.Storage.Fetch(context.Background(), c.Config.Domain)
 	if err != nil {
 		PrintError(fmt.Sprintf("Error while trying to fetch acme-dns account from storage: %s", err),0)
 		return false
@@ -138,4 +139,4 @@ func (c *AcmednsClient) findACMEAccounts() []integration.ACMEAccount {
 		c.Debug(fmt.Sprintf("Looking for ACME accounts from %s configuration", i.Name()))
 	}
 	return acmeAccts
-}
+}