WIP

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

cmd/jpictl/dump.go

@@ -2,78 +2,27 @@ package main
 
 import (
 	"bytes"
-	"encoding/json"
-	"io"
 	"os"
 
 	"github.com/burntSushi/toml"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
 
 	"git.jpi.io/amery/jpictl/pkg/zones"
 )
 
-// Encoder represents an object that encodes another internally
-type Encoder interface {
-	Encode(any) error
-}
-
-// Encoding represents a type of [Encoder]
-type Encoding int
-
-const (
-	// TOMLEncoding represents TOML encoding
-	TOMLEncoding Encoding = iota
-	// JSONEncoding represents JSON encoding
-	JSONEncoding
-	// YAMLEncoding represents YAML encoding
-	YAMLEncoding
-)
-
-// NewJSONEncoder returns a JSON [Encoder] to work on the given [io.Writer]
-func NewJSONEncoder(w io.Writer) Encoder {
-	enc := json.NewEncoder(w)
-	enc.SetIndent(``, `  `)
-	return enc
-}
-
-// NewYAMLEncoder returns a YAML [Encoder] to work on the given [io.Writer]
-func NewYAMLEncoder(w io.Writer) Encoder {
-	enc := yaml.NewEncoder(w)
-	enc.SetIndent(2)
-	return enc
-}
-
-// NewTOMLEncoder returns a TOML [Encoder] to work on the given [io.Writer]
-func NewTOMLEncoder(w io.Writer) Encoder {
-	enc := toml.NewEncoder(w)
-	return enc
-}
-
-const encoding = YAMLEncoding
-
 // Command
 var dumpCmd = &cobra.Command{
 	Use:   "dump",
-	Short: "generates a text representation of the config",
+	Short: "generates a toml representation of the config",
 	RunE: func(_ *cobra.Command, _ []string) error {
 		var buf bytes.Buffer
-		var enc Encoder
 
 		m, err := zones.New(cfg.Base, cfg.Domain)
 		if err != nil {
 			return err
 		}
 
-		switch encoding {
+		enc := toml.NewEncoder(&buf)
-		case JSONEncoding:
-			enc = NewJSONEncoder(&buf)
-		case YAMLEncoding:
-			enc = NewYAMLEncoder(&buf)
-		default:
-			enc = NewTOMLEncoder(&buf)
-		}
-
 		if err = enc.Encode(m); err != nil {
 			return err
 		}

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/spf13/cobra v1.7.0
 	golang.org/x/crypto v0.12.0
 	gopkg.in/gcfg.v1 v1.2.3
-	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (

go.sum

@@ -90,7 +90,6 @@ golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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=

pkg/wireguard/keys.go

@@ -5,7 +5,6 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"errors"
-	"fmt"
 
 	"golang.org/x/crypto/curve25519"
 )
@@ -51,43 +50,6 @@ func (pub PublicKey) String() string {
 	}
 }
 
-// MarshalJSON encodes the key for JSON, omiting empty.
-func (key PrivateKey) MarshalJSON() ([]byte, error) {
-	return encodeKeyJSON(key.String())
-}
-
-// MarshalJSON encodes the key for JSON, omiting empty.
-func (pub PublicKey) MarshalJSON() ([]byte, error) {
-	return encodeKeyJSON(pub.String())
-}
-
-func encodeKeyJSON(s string) ([]byte, error) {
-	var out []byte
-	if s != "" {
-		out = []byte(fmt.Sprintf("%q", s))
-	}
-
-	return out, nil
-}
-
-// MarshalYAML encodes the key for YAML, omiting empty.
-func (key PrivateKey) MarshalYAML() (any, error) {
-	return encodeKeyYAML(key.String())
-}
-
-// MarshalYAML encodes the key for YAML, omiting empty.
-func (pub PublicKey) MarshalYAML() (any, error) {
-	return encodeKeyYAML(pub.String())
-}
-
-func encodeKeyYAML(s string) (any, error) {
-	if s == "" {
-		return nil, nil
-	}
-
-	return s, nil
-}
-
 // IsZero tells if the key hasn't been set
 func (key PrivateKey) IsZero() bool {
 	var zero PrivateKey

pkg/zones/env.go

@@ -10,18 +10,21 @@ import (
 // WriteEnv generates environment variables for shell scripts
 func (m *Zones) WriteEnv(w io.Writer) error {
 	var buf bytes.Buffer
+	var err error
 
 	m.writeEnvVarFn(&buf, genEnvZones, "ZONES")
 	m.ForEachZone(func(z *Zone) bool {
-		m.writeEnvZone(&buf, z)
+		err = m.writeEnvZone(&buf, z)
-		return false
+		return err != nil
 	})
 
-	_, err := buf.WriteTo(w)
+	if err == nil {
+		_, err = buf.WriteTo(w)
+	}
 	return err
 }
 
-func (m *Zones) writeEnvZone(w io.Writer, z *Zone) {
+func (m *Zones) writeEnvZone(w io.Writer, z *Zone) error {
 	zoneID := z.ID
 
 	// ZONE{zoneID}
@@ -35,8 +38,11 @@ func (m *Zones) writeEnvZone(w io.Writer, z *Zone) {
 	m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
 
 	// ZONE{zoneID}_IP
-	ip, _ := RingZeroAddress(zoneID, gatewayID)
+	if ip, ok := RingZeroAddress(zoneID, gatewayID); ok {
-	m.writeEnvVar(w, ip.String(), "ZONE%v_%s", zoneID, "IP")
+		m.writeEnvVar(w, ip.String(), "ZONE%v_%s", zoneID, "IP")
+	}
+
+	return nil
 }
 
 func (m *Zones) writeEnvVarFn(w io.Writer, fn func(*Zones) string, name string, args ...any) {
@@ -79,13 +85,9 @@ func genEnvZoneNodes(z *Zone) string {
 }
 
 func getRingZeroGatewayID(z *Zone) int {
-	var firstNodeID, gatewayID int
+	var gatewayID int
 
 	z.ForEachMachine(func(p *Machine) bool {
-		if firstNodeID == 0 {
-			firstNodeID = p.ID
-		}
-
 		if p.IsGateway() {
 			gatewayID = p.ID
 		}
@@ -93,10 +95,5 @@ func getRingZeroGatewayID(z *Zone) int {
 		return gatewayID != 0
 	})
 
-	switch {
+	return gatewayID
-	case gatewayID == 0:
-		return firstNodeID
-	default:
-		return gatewayID
-	}
 }

pkg/zones/machine.go

@@ -3,22 +3,20 @@ package zones
 import (
 	"net/netip"
 	"strings"
+	"sync"
 )
 
-// revive:disable:line-length-limit
-
 // A Machine is a machine on a Zone
 type Machine struct {
+	mu   sync.Mutex
 	zone *Zone
-	ID   int    `toml:"id"`
+	ID   int
-	Name string `toml:"-" json:"-" yaml:"-"`
+	Name string `toml:"name"`
 
-	PublicAddresses []netip.Addr `toml:"public,omitempty" json:"public,omitempty" yaml:"public,omitempty"`
+	PublicAddresses []netip.Addr `toml:"public,omitempty"`
-	Rings           []*RingInfo  `toml:"rings,omitempty"  json:"rings,omitempty"  yaml:"rings,omitempty"`
+	Rings           []*RingInfo  `toml:"rings,omitempty"`
 }
 
-// revive:enable:line-length-limit
-
 func (m *Machine) String() string {
 	return m.Name
 }
@@ -43,6 +41,27 @@ func (m *Machine) IsGateway() bool {
 	return ok
 }
 
+// SetGateway enables/disables a Machine ring0 integration
+func (m *Machine) SetGateway(enabled bool) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	ri, found := m.getRingInfo(0)
+	switch {
+	case !found && !enabled:
+		return nil
+	case !found:
+		var err error
+
+		if ri, err = m.createRingInfo(0, false); err != nil {
+			return err
+		}
+	}
+
+	ri.Enabled = enabled
+	return m.syncRingConfig(0)
+}
+
 func (m *Machine) getPeerByName(name string) (*Machine, bool) {
 	return m.zone.zones.GetMachineByName(name)
 }

pkg/zones/machine_file.go

@@ -1,9 +1,7 @@
 package zones
 
 import (
-	"bytes"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 
@@ -19,22 +17,13 @@ func (m *Machine) OpenFile(name string, flags int, args ...any) (fs.File, error)
 }
 
 // CreateTruncFile creates or truncates a file on the machine's config directory
-func (m *Machine) CreateTruncFile(name string, args ...any) (io.WriteCloser, error) {
+func (m *Machine) CreateTruncFile(name string, args ...any) (fs.File, error) {
-	return m.openWriter(name, os.O_CREATE|os.O_TRUNC, args...)
+	return m.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, args...)
 }
 
 // CreateFile creates a file on the machine's config directory
-func (m *Machine) CreateFile(name string, args ...any) (io.WriteCloser, error) {
+func (m *Machine) CreateFile(name string, args ...any) (fs.File, error) {
-	return m.openWriter(name, os.O_CREATE, args...)
+	return m.OpenFile(name, os.O_RDWR|os.O_CREATE, args...)
-}
-
-func (m *Machine) openWriter(name string, flags int, args ...any) (io.WriteCloser, error) {
-	f, err := m.OpenFile(name, os.O_WRONLY|flags, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	return f.(io.WriteCloser), nil
 }
 
 // RemoveFile deletes a file from the machine's config directory
@@ -59,19 +48,6 @@ func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
 	return fs.ReadFile(base, fullName)
 }
 
-// WriteStringFile writes the given content to a file on the machine's config directory
-func (m *Machine) WriteStringFile(value string, name string, args ...any) error {
-	f, err := m.CreateTruncFile(name, args...)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	buf := bytes.NewBufferString(value)
-	_, err = buf.WriteTo(f)
-	return err
-}
-
 func (m *Machine) getFilename(name string, args ...any) string {
 	if len(args) > 0 {
 		name = fmt.Sprintf(name, args...)

pkg/zones/machine_rings.go

@@ -73,60 +73,6 @@ func (m *Machine) tryReadWireguardKeys(ring int) error {
 	}
 }
 
-// WriteWireguardKeys writes the wgN.key/wgN.pub files
-func (m *Machine) WriteWireguardKeys(ring int) error {
-	var err error
-	var key, pub string
-	var ri *RingInfo
-
-	ri, _ = m.getRingInfo(ring)
-	if ri != nil {
-		key = ri.Keys.PrivateKey.String()
-		pub = ri.Keys.PublicKey.String()
-	}
-
-	switch {
-	case key == "":
-		return fs.ErrNotExist
-	case pub == "":
-		pub = ri.Keys.PrivateKey.Public().String()
-	}
-
-	err = m.WriteStringFile(key, "wg%v.key", ring)
-	if err != nil {
-		return err
-	}
-
-	err = m.WriteStringFile(pub, "wg%v.pub", ring)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// RemoveWireguardKeys deletes wgN.key and wgN.pub from
-// the machine's config directory
-func (m *Machine) RemoveWireguardKeys(ring int) error {
-	var err error
-
-	err = m.RemoveFile("wg%v.pub", ring)
-	switch {
-	case os.IsNotExist(err):
-		// ignore
-	case err != nil:
-		return err
-	}
-
-	err = m.RemoveFile("wg%v.key", ring)
-	if os.IsNotExist(err) {
-		// ignore
-		err = nil
-	}
-
-	return err
-}
-
 // GetWireguardConfig reads a wgN.conf file
 func (m *Machine) GetWireguardConfig(ring int) (*wireguard.Config, error) {
 	data, err := m.ReadFile("wg%v.conf", ring)
@@ -251,13 +197,90 @@ func (m *Machine) applyZoneNodeID(zoneID, nodeID int) error {
 	return nil
 }
 
-// RemoveWireguardConfig deletes wgN.conf from the machine's
+func (*Machine) syncRingConfig(_ int) error {
-// config directory.
+	// _, err := m.getRingNodes(ring)
-func (m *Machine) RemoveWireguardConfig(ring int) error {
+	return nil
-	err := m.RemoveFile("wg%v.conf", ring)
+}
-	if os.IsNotExist(err) {
+
-		err = nil
+func (m *Machine) createRingInfo(ring int, enabled bool) (*RingInfo, error) {
+	keys, err := wireguard.NewKeyPair()
+	if err != nil {
+		return nil, err
 	}
 
-	return err
+	ri := &RingInfo{
+		Ring:    ring,
+		Enabled: enabled,
+		Keys:    keys,
+	}
+
+	err = m.applyRingInfo(ring, ri)
+	if err != nil {
+		return nil, err
+	}
+
+	return ri, nil
+}
+
+func (m *Machine) writeRingInfo(ri *RingInfo) error {
+	var err error
+
+	if m == nil || ri == nil {
+		return fs.ErrInvalid
+	}
+
+	err = m.writeRingInfoPrivate(ri.Ring, ri.Keys.PrivateKey)
+	if err != nil {
+		return err
+	}
+
+	err = m.writeRingInfoPublic(ri.Ring, ri.Keys.PublicKey)
+	if err != nil {
+		return err
+	}
+
+	if !ri.Enabled {
+		return m.deleteRingInfoConf(ri.Ring)
+	}
+
+	return m.writeRingInfoConf(ri.Ring, ri.Keys.PrivateKey)
+}
+
+func (m *Machine) writeRingInfoPrivate(ring int, _ wireguard.PrivateKey) error {
+	f, err := m.CreateTruncFile("wg%v.key", ring)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	return nil
+}
+func (m *Machine) writeRingInfoPublic(ring int, _ wireguard.PublicKey) error {
+	f, err := m.CreateTruncFile("wg%v.pub", ring)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	return nil
+}
+func (m *Machine) writeRingInfoConf(ring int, _ wireguard.PrivateKey) error {
+	f, err := m.CreateTruncFile("wg%v.conf", ring)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	return nil
+}
+
+func (m *Machine) deleteRingInfoConf(ring int) error {
+	err := m.RemoveFile("wg%v.conf", ring)
+
+	switch err {
+	case os.ErrNotExist:
+		return nil
+	default:
+		return err
+	}
 }

pkg/zones/zones.go

@@ -3,7 +3,6 @@ package zones
 
 import (
 	"io/fs"
-	"path/filepath"
 
 	"github.com/hack-pad/hackpadfs/os"
 
@@ -14,8 +13,8 @@ import (
 type Zone struct {
 	zones *Zones
 
-	ID   int    `toml:"id"`
+	ID   int
-	Name string `toml:"name"`
+	Name string
 
 	Machines []*Machine `toml:"machines"`
 }
@@ -34,6 +33,31 @@ func (z *Zone) ForEachMachine(fn func(*Machine) bool) {
 	}
 }
 
+// SetGateway configures a machine to be the zone's ring0 gateway
+func (z *Zone) SetGateway(gatewayID int, enabled bool) error {
+	var err error
+	var found bool
+
+	z.ForEachMachine(func(p *Machine) bool {
+		if p.ID == gatewayID {
+			found = true
+			err = p.SetGateway(enabled)
+
+			return true
+		}
+		return false
+	})
+
+	switch {
+	case err != nil:
+		return err
+	case !found:
+		return fs.ErrNotExist
+	default:
+		return nil
+	}
+}
+
 // Zones represents all zones in a cluster
 type Zones struct {
 	dir      fs.FS
@@ -106,12 +130,7 @@ func NewFS(dir fs.FS, domain string) (*Zones, error) {
 
 // New builds a [Zones] tree using the given directory
 func New(dir, domain string) (*Zones, error) {
-	dir, err := filepath.Abs(dir)
+	base, err := os.NewFS().Sub(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	base, err := os.NewFS().Sub(dir[1:])
 	if err != nil {
 		return nil, err
 	}