zones: load wireguard key pairs on Machine.init()

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

go.mod

@@ -8,7 +8,6 @@ require (
 	darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf
 	darvaza.org/slog v0.5.2
 	github.com/burntSushi/toml v0.3.1
-	github.com/hack-pad/hackpadfs v0.2.1
 	github.com/mgechev/revive v1.3.2
 	github.com/spf13/cobra v1.7.0
 	golang.org/x/crypto v0.12.0

go.sum

@@ -26,8 +26,6 @@ github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBD
 github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/hack-pad/hackpadfs v0.2.1 h1:FelFhIhv26gyjujoA/yeFO+6YGlqzmc9la/6iKMIxMw=
-github.com/hack-pad/hackpadfs v0.2.1/go.mod h1:khQBuCEwGXWakkmq8ZiFUvUZz84ZkJ2KNwKvChs4OrU=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=

pkg/zones/env.go

@@ -78,31 +78,27 @@ func genEnvZoneNodes(z *Zone) string {
 	return strings.Join(s, " ")
 }
 
-func getRingZeroGatewayID(z *Zone) (int, error) {
+func getRingZeroGatewayID(z *Zone) int {
-	var gatewayID int
+	var firstNodeID, gatewayID int
-	var first *Machine
 
 	z.ForEachMachine(func(p *Machine) bool {
 		nodeID := p.ID()
 
-		if first == nil {
+		if firstNodeID == 0 {
-			first = p
+			firstNodeID = nodeID
 		}
 
-		if p.IsGateway() {
+		if _, found := p.getRingInfo(0); found {
 			gatewayID = nodeID
 		}
 
 		return gatewayID != 0
 	})
 
-	if gatewayID == 0 {
+	switch {
-		gatewayID = first.ID()
+	case gatewayID == 0:
-
+		return firstNodeID
-		if err := first.SetGateway(true); err != nil {
+	default:
-			return gatewayID, err
+		return gatewayID
-		}
 	}
-
-	return gatewayID, nil
 }

pkg/zones/machine.go

@@ -1,7 +1,10 @@
 package zones
 
 import (
+	"fmt"
+	"io/fs"
 	"net/netip"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
@@ -58,34 +61,28 @@ func (m *Machine) FullName() string {
 	return m.Name
 }
 
-// IsGateway tells if the Machine is a ring0 gateway
+// ReadFile reads a file from the machine's config directory
-func (m *Machine) IsGateway() bool {
+func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
-	m.mu.Lock()
+	base := m.zone.zones.dir
-	defer m.mu.Unlock()
+	fullName := m.getFilename(name, args...)
 
-	if ri, found := m.getRingInfo(0); found {
+	return fs.ReadFile(base, fullName)
-		return ri.Enabled
-	}
-
-	return false
 }
 
-// SetGateway enables/disables a Machine ring0 integration
+func (m *Machine) getFilename(name string, args ...any) string {
-func (m *Machine) SetGateway(enabled bool) error {
+	if len(args) > 0 {
-	m.mu.Lock()
+		name = fmt.Sprintf(name, args...)
-	defer m.mu.Unlock()
-
-	ri, found := m.getRingInfo(0)
-	switch {
-	case !found && !enabled:
-		return nil
-	case !found:
-		return m.createRingInfo(0, true)
-	default:
-		ri.Enabled = enabled
-		return m.writeRingInfo(ri)
 	}
+
+	s := []string{
+		m.zone.Name,
+		m.Name,
+		name,
+	}
+
+	return filepath.Join(s...)
 }
+
 func (m *Machine) getPeerByName(name string) (*Machine, bool) {
 	return m.zone.zones.GetMachineByName(name)
 }

pkg/zones/machine_file.go

@@ -1,63 +0,0 @@
-package zones
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	fs "github.com/hack-pad/hackpadfs"
-)
-
-// OpenFile opens a file on the machine's config directory with the specified flags
-func (m *Machine) OpenFile(name string, flags int, args ...any) (fs.File, error) {
-	base := m.zone.zones.dir
-	fullName := m.getFilename(name, args...)
-
-	return fs.OpenFile(base, fullName, flags, 0644)
-}
-
-// CreateTruncFile creates or truncates a file on the machine's config directory
-func (m *Machine) CreateTruncFile(name string, args ...any) (fs.File, error) {
-	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) (fs.File, error) {
-	return m.OpenFile(name, os.O_RDWR|os.O_CREATE, args...)
-}
-
-// RemoveFile deletes a file from the machine's config directory
-func (m *Machine) RemoveFile(name string, args ...any) error {
-	base := m.zone.zones.dir
-	fullName := m.getFilename(name, args...)
-	err := fs.Remove(base, fullName)
-
-	switch {
-	case os.IsNotExist(err):
-		return nil
-	default:
-		return err
-	}
-}
-
-// ReadFile reads a file from the machine's config directory
-func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
-	base := m.zone.zones.dir
-	fullName := m.getFilename(name, args...)
-
-	return fs.ReadFile(base, fullName)
-}
-
-func (m *Machine) getFilename(name string, args ...any) string {
-	if len(args) > 0 {
-		name = fmt.Sprintf(name, args...)
-	}
-
-	s := []string{
-		m.zone.Name,
-		m.Name,
-		name,
-	}
-
-	return filepath.Join(s...)
-}

pkg/zones/machine_rings.go

@@ -3,7 +3,6 @@ package zones
 import (
 	"bytes"
 	"fmt"
-	"io/fs"
 	"os"
 
 	"darvaza.org/core"
@@ -11,6 +10,77 @@ import (
 	"git.jpi.io/amery/jpictl/pkg/wireguard"
 )
 
+// GetWireguardKeys reads a wgN.key/wgN.pub files
+func (m *Machine) GetWireguardKeys(ring int) (*wireguard.KeyPair, error) {
+	var (
+		data []byte
+		err  error
+		key  wireguard.PrivateKey
+		pub  wireguard.PublicKey
+	)
+
+	data, err = m.ReadFile("wg%v.key", ring)
+	if err != nil {
+		// failed to read
+		return nil, err
+	}
+
+	key, err = wireguard.PrivateKeyFromBase64(string(data))
+	if err != nil {
+		// bad key
+		err = core.Wrapf(err, "wg%v.key", ring)
+		return nil, err
+	}
+
+	data, err = m.ReadFile("wg%v.pub", ring)
+	switch {
+	case os.IsNotExist(err):
+		// no wgN.pub is fine
+	case err != nil:
+		// failed to read
+		return nil, err
+	default:
+		// good read
+		pub, err = wireguard.PublicKeyFromBase64(string(data))
+		if err != nil {
+			// bad key
+			err = core.Wrapf(err, "wg%v.pub", ring)
+			return nil, err
+		}
+	}
+
+	kp := &wireguard.KeyPair{
+		PrivateKey: key,
+		PublicKey:  pub,
+	}
+
+	if err = kp.Validate(); err != nil {
+		return nil, err
+	}
+
+	return kp, nil
+}
+
+func (m *Machine) tryReadWireguardKeys(ring int) error {
+	kp, err := m.GetWireguardKeys(ring)
+	switch {
+	case os.IsNotExist(err):
+		// ignore
+		return nil
+	case err != nil:
+		// something went wrong
+		return err
+	default:
+		// import keys
+		ri := &RingInfo{
+			Ring: ring,
+			Keys: kp,
+		}
+
+		return m.applyRingInfo(ring, ri)
+	}
+}
+
 // GetWireguardConfig reads a wgN.conf file
 func (m *Machine) GetWireguardConfig(ring int) (*wireguard.Config, error) {
 	data, err := m.ReadFile("wg%v.conf", ring)
@@ -135,86 +205,3 @@ func (m *Machine) applyZoneNodeID(zoneID, nodeID int) error {
 
 	return nil
 }
-
-func (m *Machine) createRingInfo(ring int, enabled bool) error {
-	keys, err := wireguard.NewKeyPair()
-	if err != nil {
-		return err
-	}
-
-	ri := &RingInfo{
-		Ring:    ring,
-		Enabled: enabled,
-		Keys:    keys,
-	}
-
-	err = m.applyRingInfo(ring, ri)
-	if err != nil {
-		return err
-	}
-
-	return m.writeRingInfo(ri)
-}
-
-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/machine_scan.go

@@ -25,6 +25,15 @@ func (m *Machine) updatePublicAddresses() error {
 	return nil
 }
 
+func (m *Machine) init() error {
+	for i := 0; i < RingsCount; i++ {
+		if err := m.tryReadWireguardKeys(i); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (m *Machine) scan() error {
 	for i := 0; i < RingsCount; i++ {
 		if err := m.tryApplyWireguardConfig(i); err != nil {

pkg/zones/rings.go

@@ -31,9 +31,9 @@ func (ri *RingInfo) Merge(alter *RingInfo) error {
 	case ri.Ring != alter.Ring:
 		// different ring
 		return fmt.Errorf("invalid %s: %v ≠ %v", "ring", ri.Ring, alter.Ring)
-	case ri.Enabled != alter.Enabled:
+	case ri.Enabled && !alter.Enabled:
-		// different state
+		// can't disable via Merge
-		return fmt.Errorf("invalid %s: %v ≠ %v", "enabled", ri.Enabled, alter.Enabled)
+		return fmt.Errorf("invalid %s: %v → %v", "enabled", ri.Enabled, alter.Enabled)
 	case !canMergeAddress(ri.Address, alter.Address):
 		// different address
 		return fmt.Errorf("invalid %s: %v ≠ %v", "address", ri.Address, alter.Address)
@@ -42,6 +42,15 @@ func (ri *RingInfo) Merge(alter *RingInfo) error {
 		return fmt.Errorf("invalid %s: %s ≠ %s", "keys", ri.Keys, alter.Keys)
 	}
 
+	return ri.unsafeMerge(alter)
+}
+
+func (ri *RingInfo) unsafeMerge(alter *RingInfo) error {
+	// enable via Merge
+	if alter.Enabled {
+		ri.Enabled = true
+	}
+
 	switch {
 	case ri.Keys == nil:
 		// assign keypair

pkg/zones/scan.go

@@ -129,6 +129,10 @@ func (z *Zone) scan() error {
 				Name: e.Name(),
 			}
 
+			if err := m.init(); err != nil {
+				return err
+			}
+
 			z.Machines = append(z.Machines, m)
 		}
 	}

pkg/zones/zones.go

@@ -3,8 +3,7 @@ package zones
 
 import (
 	"io/fs"
-
+	"os"
-	"github.com/hack-pad/hackpadfs/os"
 
 	"darvaza.org/resolver"
 )
@@ -33,31 +32,6 @@ 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
@@ -130,10 +104,5 @@ 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) {
-	base, err := os.NewFS().Sub(dir)
+	return NewFS(os.DirFS(dir), domain)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewFS(base, domain)
 }