build-sys: use local asciigoat.org/ini

Signed-off-by: Alejandro Mery <amery@jpi.io>

cmd/jpictl/dns.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"os"
-	"time"
 
 	"github.com/spf13/cobra"
 
@@ -11,13 +10,9 @@ import (
 	"git.jpi.io/amery/jpictl/pkg/dns"
 )
 
-const (
-	// DNSSyncTimeout specifies how long are we willing to wait for a DNS
-	// synchronization
-	DNSSyncTimeout = 10 * time.Second
-)
+func newDNSManager(m *cluster.Cluster) (*dns.Manager, error) {
+	ctx := context.TODO()
 
-func newDNSManager(m *cluster.Cluster, provider dns.Provider) (*dns.Manager, error) {
 	domain := m.Domain
 	if m.Name != "" {
 		domain = m.Name + "." + domain
@@ -28,26 +23,6 @@ func newDNSManager(m *cluster.Cluster, provider dns.Provider) (*dns.Manager, err
 		return nil, err
 	}
 
-	if provider != nil {
-		// set provider only  if specified
-		err = dns.WithProvider(provider)(mgr)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if err := populateDNSManager(mgr, m); err != nil {
-		return nil, err
-	}
-
-	return mgr, nil
-}
-
-func populateDNSManager(mgr *dns.Manager, m *cluster.Cluster) error {
-	var err error
-
-	ctx := context.TODO()
-
 	m.ForEachZone(func(z *cluster.Zone) bool {
 		z.ForEachMachine(func(p *cluster.Machine) bool {
 			err = mgr.AddHost(ctx, z.Name, p.ID, true, p.PublicAddresses...)
@@ -57,7 +32,7 @@ func populateDNSManager(mgr *dns.Manager, m *cluster.Cluster) error {
 		return err != nil
 	})
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	m.ForEachRegion(func(r *cluster.Region) bool {
@@ -68,8 +43,11 @@ func populateDNSManager(mgr *dns.Manager, m *cluster.Cluster) error {
 
 		return err != nil
 	})
+	if err != nil {
+		return nil, err
+	}
 
-	return err
+	return mgr, nil
 }
 
 // Command
@@ -79,7 +57,6 @@ var dnsCmd = &cobra.Command{
 
 var dnsWriteCmd = &cobra.Command{
 	Use:    "write",
-	Short:  "dns write generates public DNS records",
 	PreRun: setVerbosity,
 	RunE: func(_ *cobra.Command, _ []string) error {
 		m, err := cfg.LoadZones(true)
@@ -87,7 +64,7 @@ var dnsWriteCmd = &cobra.Command{
 			return err
 		}
 
-		mgr, err := newDNSManager(m, nil)
+		mgr, err := newDNSManager(m)
 		if err != nil {
 			return err
 		}
@@ -97,36 +74,8 @@ var dnsWriteCmd = &cobra.Command{
 	},
 }
 
-var dnsSyncCmd = &cobra.Command{
-	Use:    "sync",
-	Short:  "dns sync updates public DNS records",
-	PreRun: setVerbosity,
-	RunE: func(_ *cobra.Command, _ []string) error {
-		cred, err := dns.DefaultDNSProvider()
-		if err != nil {
-			return err
-		}
-
-		m, err := cfg.LoadZones(true)
-		if err != nil {
-			return err
-		}
-
-		mgr, err := newDNSManager(m, cred)
-		if err != nil {
-			return err
-		}
-
-		ctx, cancel := context.WithTimeout(context.Background(), DNSSyncTimeout)
-		defer cancel()
-
-		return mgr.Sync(ctx)
-	},
-}
-
 func init() {
 	rootCmd.AddCommand(dnsCmd)
 
 	dnsCmd.AddCommand(dnsWriteCmd)
-	dnsCmd.AddCommand(dnsSyncCmd)
 }

go.mod

@@ -2,6 +2,8 @@ module git.jpi.io/amery/jpictl
 
 go 1.19
 
+replace asciigoat.org/ini => ../../../asciigoat.org/ini
+
 require (
 	asciigoat.org/ini v0.2.5
 	darvaza.org/core v0.9.8
@@ -17,7 +19,6 @@ require (
 	github.com/spf13/cobra v1.7.0
 	golang.org/x/crypto v0.12.0
 	golang.org/x/net v0.14.0
-	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -45,5 +46,4 @@ require (
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.12.0 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -1,7 +1,5 @@
 asciigoat.org/core v0.3.9 h1:hgDDz4ecm3ZvehX++m8A/IzAt+B5oDPiRtxatzfUHPQ=
 asciigoat.org/core v0.3.9/go.mod h1:CAaHwyw8MpAq4a1MYtN2dxJrsK+hmIdW50OndaQZYPI=
-asciigoat.org/ini v0.2.5 h1:4gRIp9rU+XQt8+HMqZO5R7GavMv9Yl2+N+je6djDIAE=
-asciigoat.org/ini v0.2.5/go.mod h1:gmXzJ9XFqf1NLk5nQkj04USQ4tMtdRJHNQX6vp3DzjU=
 darvaza.org/core v0.9.8 h1:luLxgfUc2pzuusYPo/Z/dC/qr9XZPKpSQw8/kS7zNUM=
 darvaza.org/core v0.9.8/go.mod h1:Dbme64naxeshQfxcVJX9ZT7AiGyIY8kldfuELVtf8mw=
 darvaza.org/resolver v0.5.4 h1:dlSBNV14yYsp7Kg7ipwYOMNsLbrpeXa8Z0HBTa0Ryxs=
@@ -103,10 +101,6 @@ golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
 golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
-gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
-gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/dns/provider.go

@@ -18,8 +18,6 @@ const (
 type Provider interface {
 	libdns.RecordGetter
 	libdns.RecordDeleter
-	libdns.RecordSetter
-	libdns.RecordAppender
 }
 
 // DefaultDNSProvider returns a cloudflare DNS provider

pkg/dns/record.go

@@ -167,7 +167,6 @@ func (mgr *Manager) genAllAddrRecords() []AddrRecord {
 		out = append(out, rec)
 	}
 
-	SortAddrRecords(out)
 	return out
 }
 

pkg/dns/sync.go

@@ -1,347 +0,0 @@
-package dns
-
-import (
-	"context"
-	"errors"
-	"net/netip"
-	"sort"
-	"strings"
-	"time"
-
-	"darvaza.org/core"
-	"darvaza.org/slog"
-	"github.com/libdns/libdns"
-)
-
-// SyncAddrRecord is similar to AddrRecord but include libdns.Record details
-// fetched from the Provider
-type SyncAddrRecord struct {
-	Name  string
-	Addrs []SyncAddr
-}
-
-// SyncAddr extends netip.Addr with ID and TTL fetched from the Provider
-type SyncAddr struct {
-	ID   string
-	Addr netip.Addr
-	TTL  time.Duration
-}
-
-// Export assembles a libdns.Record
-func (rec *SyncAddr) Export(name string) libdns.Record {
-	return libdns.Record{
-		ID:    rec.ID,
-		Name:  name,
-		Type:  core.IIf(rec.Addr.Is6(), "AAAA", "A"),
-		TTL:   time.Second,
-		Value: rec.Addr.String(),
-	}
-}
-
-// SortSyncAddrSlice sorts a slice of [SyncAddr] by its address
-func SortSyncAddrSlice(s []SyncAddr) []SyncAddr {
-	sort.Slice(s, func(i, j int) bool {
-		a1 := s[i].Addr
-		a2 := s[j].Addr
-		return a1.Less(a2)
-	})
-	return s
-}
-
-// GetRecords pulls all the address records on DNS for our domain
-func (mgr *Manager) GetRecords(ctx context.Context) ([]SyncAddrRecord, error) {
-	if mgr.p == nil {
-		return nil, errors.New("dns provider not specified")
-	}
-
-	recs, err := mgr.p.GetRecords(ctx, mgr.domain)
-	if err != nil {
-		return nil, err
-	}
-
-	return mgr.filteredRecords(recs)
-}
-
-// AsSyncAddr converts a A or AAAA [libdns.Record] into a [SyncAddr]
-func (mgr *Manager) AsSyncAddr(rr libdns.Record) (SyncAddr, bool, error) {
-	var out SyncAddr
-	var addr netip.Addr
-
-	// skip non-address types
-	if rr.Type != "A" && rr.Type != "AAAA" {
-		return out, false, nil
-	}
-
-	// skip entries not containing our suffix
-	if mgr.suffix != "" {
-		if !strings.HasSuffix(rr.Name, mgr.suffix) {
-			return out, false, nil
-		}
-	}
-
-	err := addr.UnmarshalText([]byte(rr.Value))
-	if err != nil {
-		// invalid address on A or AAAA record
-		return out, false, err
-	}
-
-	out = SyncAddr{
-		ID:   rr.ID,
-		TTL:  rr.TTL,
-		Addr: addr,
-	}
-
-	return out, true, nil
-}
-
-func (mgr *Manager) filteredRecords(recs []libdns.Record) ([]SyncAddrRecord, error) {
-	// filter and convert
-	cache := make(map[string][]SyncAddr)
-	for _, rr := range recs {
-		addr, ok, err := mgr.AsSyncAddr(rr)
-		switch {
-		case err != nil:
-			// skip invalid addresses
-			mgr.l.Error().
-				WithField("subsystem", "dns").
-				WithField(slog.ErrorFieldName, err).
-				WithField("name", rr.Name).
-				WithField("type", rr.Type).
-				WithField("addr", rr.Value).
-				Print()
-		case ok:
-			// store
-			cache[rr.Name] = append(cache[rr.Name], addr)
-		}
-	}
-
-	// prepare records
-	out := make([]SyncAddrRecord, len(cache))
-	names := make([]string, 0, len(cache))
-	for name := range cache {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-
-	for i, name := range names {
-		addrs := cache[name]
-
-		out[i] = SyncAddrRecord{
-			Name:  name,
-			Addrs: SortSyncAddrSlice(addrs),
-		}
-	}
-
-	return out, nil
-}
-
-// Sync updates all the address records on DNS for our domain
-func (mgr *Manager) Sync(ctx context.Context) error {
-	current, err := mgr.GetRecords(ctx)
-	if err != nil {
-		return core.Wrap(err, "GetRecords")
-	}
-
-	goal := mgr.genAllAddrRecords()
-	for _, p := range makeSyncMap(current, goal) {
-		err := mgr.doSync(ctx, p.Name, p.Before, p.After)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (mgr *Manager) doSync(ctx context.Context, name string,
-	before []SyncAddr, after []netip.Addr) error {
-	//
-	var err error
-
-	for _, a := range after {
-		before, err = mgr.doSyncUpdateOrInsert(ctx, name, a, before)
-		if err != nil {
-			return err
-		}
-	}
-
-	for _, b := range before {
-		err = mgr.doSyncRemove(ctx, name, b)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (mgr *Manager) doSyncUpdateOrInsert(ctx context.Context, name string,
-	addr netip.Addr, addrs []SyncAddr) ([]SyncAddr, error) {
-	//
-	var err error
-
-	i, ok := findSyncAddrSorted(addr, addrs)
-	if ok {
-		rec := addrs[i]
-
-		addrs = append(addrs[:i], addrs[i+1:]...)
-		err = mgr.doSyncUpdate(ctx, name, addr, rec)
-	} else {
-		err = mgr.doSyncInsert(ctx, name, addr)
-	}
-
-	return addrs, err
-}
-
-func (mgr *Manager) doSyncUpdate(ctx context.Context, name string,
-	addr netip.Addr, rec SyncAddr) error {
-	//
-	var log slog.Logger
-	var msg string
-	var err error
-
-	if rec.TTL != time.Second {
-		// amend TTL
-
-		// TODO: batch updates
-		_, err = mgr.p.SetRecords(ctx, mgr.domain, []libdns.Record{
-			rec.Export(name),
-		})
-
-		if err == nil {
-			log = mgr.l.Info()
-			msg = "Updated"
-		} else {
-			log = mgr.l.Error().
-				WithField(slog.ErrorFieldName, err)
-			msg = "Failed"
-		}
-	} else {
-		log = mgr.l.Info()
-		msg = "OK"
-	}
-
-	log.
-		WithField("subsystem", "dns").
-		WithField("name", name).
-		WithField("addr", addr).
-		Print(msg)
-
-	return err
-}
-
-func (mgr *Manager) doSyncInsert(ctx context.Context, name string,
-	addr netip.Addr) error {
-	//
-	var log slog.Logger
-	var msg string
-
-	rec := libdns.Record{
-		Name:  name,
-		Type:  core.IIf(addr.Is6(), "AAAA", "A"),
-		TTL:   time.Second,
-		Value: addr.String(),
-	}
-
-	_, err := mgr.p.AppendRecords(ctx, mgr.domain, []libdns.Record{
-		rec,
-	})
-
-	if err != nil {
-		log = mgr.l.Error().
-			WithField(slog.ErrorFieldName, err)
-		msg = "Failed to Add"
-	} else {
-		log = mgr.l.Info()
-		msg = "Added"
-	}
-
-	log.
-		WithField("subsystem", "dns").
-		WithField("name", name).
-		WithField("addr", addr).
-		Print(msg)
-	return err
-}
-
-func (mgr *Manager) doSyncRemove(ctx context.Context, name string,
-	rec SyncAddr) error {
-	//
-	var log slog.Logger
-	var msg string
-
-	// TODO: batch deletes
-	_, err := mgr.p.DeleteRecords(ctx, mgr.domain, []libdns.Record{
-		rec.Export(name),
-	})
-
-	if err != nil {
-		log = mgr.l.Error().
-			WithField(slog.ErrorFieldName, err)
-		msg = "Failed to Delete"
-	} else {
-		log = mgr.l.Warn()
-		msg = "Deleted"
-	}
-
-	log.
-		WithField("subsystem", "dns").
-		WithField("name", name).
-		WithField("addr", rec.Addr).
-		Print(msg)
-	return err
-}
-
-func findSyncAddrSorted(target netip.Addr, addrs []SyncAddr) (int, bool) {
-	for i, a := range addrs {
-		switch target.Compare(a.Addr) {
-		case 0:
-			// match
-			return i, true
-		case -1:
-			// miss
-			return -1, false
-		default:
-			// next
-		}
-	}
-
-	return -1, false
-}
-
-type syncMapEntry struct {
-	Name   string
-	Before []SyncAddr
-	After  []netip.Addr
-}
-
-func makeSyncMap(current []SyncAddrRecord,
-	goal []AddrRecord) map[string]syncMapEntry {
-	//
-	data := make(map[string]syncMapEntry)
-
-	for _, cur := range current {
-		me, ok := data[cur.Name]
-		if !ok {
-			me = syncMapEntry{
-				Name: cur.Name,
-			}
-		}
-
-		me.Before = append(me.Before, cur.Addrs...)
-		data[cur.Name] = me
-	}
-
-	for _, rr := range goal {
-		me, ok := data[rr.Name]
-		if !ok {
-			me = syncMapEntry{
-				Name: rr.Name,
-			}
-		}
-		me.After = append(me.After, rr.Addr...)
-		data[rr.Name] = me
-	}
-
-	return data
-}

pkg/wireguard/config.go

@@ -2,7 +2,6 @@ package wireguard
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"io"
 	"net/netip"
@@ -10,8 +9,8 @@ import (
 	"strings"
 	"text/template"
 
+	"asciigoat.org/ini/basic"
 	"darvaza.org/core"
-	"gopkg.in/gcfg.v1"
 )
 
 var configTemplate = template.Must(template.New("config").Funcs(template.FuncMap{
@@ -107,6 +106,11 @@ func (ep EndpointAddress) String() string {
 	}
 }
 
+// UnmarshalText loads an endpoint address from text data
+func (ep *EndpointAddress) UnmarshalText(b []byte) error {
+	return ep.FromString(string(b))
+}
+
 // FromString sets the EndpointAddress from a given "[host]:port"
 func (ep *EndpointAddress) FromString(s string) error {
 	host, port, err := core.SplitHostPort(s)
@@ -127,98 +131,6 @@ func (ep *EndpointAddress) FromString(s string) error {
 	return nil
 }
 
-type intermediateConfig struct {
-	Interface interfaceConfig
-	Peer      peersConfig
-}
-
-func (v *intermediateConfig) Export() (*Config, error) {
-	var out Config
-	var err error
-
-	// Interface
-	out.Interface, err = v.Interface.Export()
-	if err != nil {
-		return nil, err
-	}
-
-	// Peers
-	peers, ok := v.PeersCount()
-	if !ok {
-		return nil, errors.New("inconsistent Peer data")
-	}
-
-	for i := 0; i < peers; i++ {
-		p, err := v.ExportPeer(i)
-		if err != nil {
-			err = core.Wrapf(err, "Peer[%v]:", i)
-			return nil, err
-		}
-
-		out.Peer = append(out.Peer, p)
-	}
-
-	return &out, nil
-}
-
-type interfaceConfig struct {
-	Address    netip.Addr
-	PrivateKey string
-	ListenPort uint16
-}
-
-func (p interfaceConfig) Export() (InterfaceConfig, error) {
-	var err error
-
-	out := InterfaceConfig{
-		Address:    p.Address,
-		ListenPort: p.ListenPort,
-	}
-
-	out.PrivateKey, err = PrivateKeyFromBase64(p.PrivateKey)
-	if err != nil {
-		err = core.Wrap(err, "PrivateKey")
-		return InterfaceConfig{}, err
-	}
-
-	return out, nil
-}
-
-type peersConfig struct {
-	PublicKey  []string
-	Endpoint   []string
-	AllowedIPs []string
-}
-
-func (v *intermediateConfig) ExportPeer(i int) (PeerConfig, error) {
-	var out PeerConfig
-
-	// Endpoint
-	s := v.Peer.Endpoint[i]
-	err := out.Endpoint.FromString(s)
-	if err != nil {
-		err = core.Wrap(err, "Endpoint")
-		return out, err
-	}
-
-	// PublicKey
-	out.PublicKey, err = PublicKeyFromBase64(v.Peer.PublicKey[i])
-	if err != nil {
-		err = core.Wrap(err, "PublicKey")
-		return out, err
-	}
-
-	// AllowedIPs
-	s = v.Peer.AllowedIPs[i]
-	out.AllowedIPs, err = parseAllowedIPs(s)
-	if err != nil {
-		err = core.Wrap(err, "AllowedIPs")
-		return out, err
-	}
-
-	return out, nil
-}
-
 func parseAllowedIPs(data string) ([]netip.Prefix, error) {
 	var out []netip.Prefix
 
@@ -235,25 +147,17 @@ func parseAllowedIPs(data string) ([]netip.Prefix, error) {
 	return out, nil
 }
 
-func (v *intermediateConfig) PeersCount() (int, bool) {
-	c0 := len(v.Peer.Endpoint)
-	c1 := len(v.Peer.PublicKey)
-	c2 := len(v.Peer.AllowedIPs)
-
-	if c0 != c1 || c1 != c2 {
-		return 0, false
-	}
-
-	return c0, true
-}
-
 // NewConfigFromReader parses a wgN.conf file
 func NewConfigFromReader(r io.Reader) (*Config, error) {
-	temp := &intermediateConfig{}
-
-	if err := gcfg.ReadInto(temp, r); err != nil {
+	doc, err := basic.Decode(r)
+	if err != nil {
 		return nil, err
 	}
 
-	return temp.Export()
+	cfg, err := newConfigFromDocument(doc)
+	if err != nil {
+		return nil, err
+	}
+
+	return cfg, nil
 }

pkg/wireguard/config_parser.go

@@ -0,0 +1,169 @@
+package wireguard
+
+import (
+	"io/fs"
+	"strconv"
+
+	"asciigoat.org/ini/basic"
+	"darvaza.org/core"
+)
+
+type sectionHandler func(*Config, *basic.Section) error
+
+var sectionMap = map[string]func(*Config, *basic.Section) error{
+	"Interface": loadInterfaceConfSection,
+	"Peer":      loadPeerConfSection,
+}
+
+func loadConfSection(out *Config, src *basic.Section) error {
+	h, ok := sectionMap[src.Key]
+	if !ok {
+		return core.Wrapf(fs.ErrInvalid, "unknown section %q", src.Key)
+	}
+
+	return h(out, src)
+}
+
+func loadInterfaceConfSection(out *Config, src *basic.Section) error {
+	var cfg InterfaceConfig
+
+	for _, field := range src.Fields {
+		if err := loadInterfaceConfField(&cfg, field); err != nil {
+			return core.Wrap(err, "Interface")
+		}
+	}
+
+	out.Interface = cfg
+	return nil
+}
+
+func loadPeerConfSection(out *Config, src *basic.Section) error {
+	var cfg PeerConfig
+
+	for _, field := range src.Fields {
+		if err := loadPeerConfField(&cfg, field); err != nil {
+			return core.Wrapf(err, "Peer[%v]", len(out.Peer))
+		}
+	}
+
+	out.Peer = append(out.Peer, cfg)
+	return nil
+}
+
+// revive:disable:cyclomatic
+// revive:disable:cognitive-complexity
+
+func loadInterfaceConfField(cfg *InterfaceConfig, field basic.Field) error {
+	// revive:enable:cyclomatic
+	// revive:enable:cognitive-complexity
+
+	// TODO: refactor when asciigoat's ini parser learns to do reflection
+	switch field.Key {
+	case "Address":
+		if !core.IsZero(cfg.Address) {
+			return core.Wrapf(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		err := cfg.Address.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
+	case "PrivateKey":
+		if !core.IsZero(cfg.PrivateKey) {
+			return core.Wrapf(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		err := cfg.PrivateKey.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
+	case "ListenPort":
+		if cfg.ListenPort > 0 {
+			return core.Wrapf(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		u64, err := strconv.ParseUint(field.Value, 10, 16)
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		case u64 == 0:
+			return core.Wrapf(fs.ErrInvalid, "invalid %q value", field.Key)
+		default:
+			cfg.ListenPort = uint16(u64)
+			return nil
+		}
+	default:
+		return core.Wrapf(fs.ErrInvalid, "unknown field %q", field.Key)
+	}
+}
+
+// revive:disable:cyclomatic
+// revive:disable:cognitive-complexity
+
+func loadPeerConfField(cfg *PeerConfig, field basic.Field) error {
+	// revive:enable:cyclomatic
+	// revive:enable:cognitive-complexity
+
+	switch field.Key {
+	case "PublicKey":
+		if !core.IsZero(cfg.PublicKey) {
+			return core.Wrapf(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		err := cfg.PublicKey.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
+	case "Endpoint":
+		if cfg.Endpoint.String() != "" {
+			return core.Wrapf(fs.ErrInvalid, "duplicate field %q", field.Key)
+		}
+
+		err := cfg.Endpoint.UnmarshalText([]byte(field.Value))
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		default:
+			return nil
+		}
+	case "AllowedIPs":
+		s, err := parseAllowedIPs(field.Value)
+		switch {
+		case err != nil:
+			return core.Wrap(err, field.Key)
+		case len(s) > 0:
+			cfg.AllowedIPs = append(cfg.AllowedIPs, s...)
+			return nil
+		}
+	default:
+		return core.Wrapf(fs.ErrInvalid, "unknown field %q", field.Key)
+	}
+	return nil
+}
+
+func newConfigFromDocument(doc *basic.Document) (*Config, error) {
+	var out Config
+
+	if len(doc.Global) > 0 {
+		err := core.Wrap(fs.ErrInvalid, "fields before the first section")
+		return nil, err
+	}
+
+	for i := range doc.Sections {
+		src := &doc.Sections[i]
+		if err := loadConfSection(&out, src); err != nil {
+			return nil, err
+		}
+	}
+
+	return &out, nil
+}

pkg/wireguard/keys.go

@@ -51,6 +51,30 @@ func (pub PublicKey) String() string {
 	}
 }
 
+// UnmarshalText loads the value from base64
+func (key *PrivateKey) UnmarshalText(b []byte) error {
+	v, err := PrivateKeyFromBase64(string(b))
+	switch {
+	case err != nil:
+		return err
+	default:
+		*key = v
+		return nil
+	}
+}
+
+// UnmarshalText loads the value from base64
+func (pub *PublicKey) UnmarshalText(b []byte) error {
+	v, err := PublicKeyFromBase64(string(b))
+	switch {
+	case err != nil:
+		return err
+	default:
+		*pub = v
+		return nil
+	}
+}
+
 // MarshalJSON encodes the key for JSON, omitting empty.
 func (key PrivateKey) MarshalJSON() ([]byte, error) {
 	return encodeKeyJSON(key.String())