wireguard: switch from gcfg to asciigoat [WIP]

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

go.mod

@@ -2,8 +2,13 @@ module git.jpi.io/amery/jpictl
 
 go 1.19
 
+replace (
+	asciigoat.org/core => ../../../asciigoat.org/core
+	asciigoat.org/ini => ../../../asciigoat.org/ini
+)
+
 require (
-	asciigoat.org/ini v0.2.0
+	asciigoat.org/ini v0.1.0
 	darvaza.org/core v0.9.5
 	darvaza.org/resolver v0.5.2
 	darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf
@@ -17,7 +22,7 @@ require (
 )
 
 require (
-	asciigoat.org/core v0.3.7 // indirect
+	asciigoat.org/core v0.3.6 // indirect
 	darvaza.org/slog/handlers/filter v0.4.4 // indirect
 	darvaza.org/slog/handlers/zerolog v0.4.4 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect

go.sum

@@ -1,7 +1,3 @@
-asciigoat.org/core v0.3.7 h1:tMasdvZgsMJJMVsZVfXXB5lqq82pFiCsyEmOEmcmAfI=
-asciigoat.org/core v0.3.7/go.mod h1:tXj+JUutxRbcO40ZQRuUVaZ4rnYz1kAZ0nblisV8u74=
-asciigoat.org/ini v0.2.0 h1:MlqILOtokXJtAXrfPGVpPkampx04Er8Fo6czHdpe17Y=
-asciigoat.org/ini v0.2.0/go.mod h1:GlOmfI3CwVp2veH5aze62cAZoCoWLfE6ET0ZJhsR2m0=
 darvaza.org/core v0.9.5 h1:sS5pZFwicaxJIQixEiqkMr9GknVHYL+EbKDMkR/4jDM=
 darvaza.org/core v0.9.5/go.mod h1:O3tHBMlw+xB47uGh5CUx7dXAujBAMmD8BCRFPZmIw54=
 darvaza.org/resolver v0.5.2 h1:VjHhEr/MJBszeDb7tYlXQ9Bsyh4xrDR7Sd10WAmPD6k=

pkg/wireguard/config.go

@@ -2,6 +2,7 @@ package wireguard
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"net/netip"
@@ -9,7 +10,7 @@ import (
 	"strings"
 	"text/template"
 
-	"asciigoat.org/ini/basic"
+	"asciigoat.org/ini"
 	"darvaza.org/core"
 )
 
@@ -106,11 +107,6 @@ 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)
@@ -131,6 +127,98 @@ 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
 
@@ -147,17 +235,25 @@ 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) {
-	doc, err := basic.Decode(r)
+	temp := &intermediateConfig{}
-	if err != nil {
+
+	if err := ini.ReadInto(temp, r); err != nil {
 		return nil, err
 	}
 
-	cfg, err := newConfigFromDocument(doc)
+	return temp.Export()
-	if err != nil {
-		return nil, err
-	}
-
-	return cfg, nil
 }

pkg/wireguard/config_parser.go

@@ -1,164 +0,0 @@
-package wireguard
-
-import (
-	"io/fs"
-	"net/netip"
-	"strconv"
-
-	"asciigoat.org/ini/basic"
-	"darvaza.org/core"
-)
-
-func loadConfSection(out *Config, src *basic.Section) error {
-	switch src.Key {
-	case "Interface":
-		return loadInterfaceConfSection(out, src)
-	case "Peer":
-		return loadPeerConfSection(out, src)
-	default:
-		return core.Wrapf(fs.ErrInvalid, "unknown section %q", src.Key)
-	}
-}
-
-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
-	switch field.Key {
-	case "Address":
-		var zero netip.Addr
-		if cfg.Address != zero {
-			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 !cfg.PrivateKey.IsZero() {
-			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 !cfg.PublicKey.IsZero() {
-			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 nil, fs.ErrNotExist
-}

pkg/wireguard/keys.go

@@ -51,30 +51,6 @@ 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())