zones: Machine.WriteWireguardKeys()

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

go.mod

@@ -8,6 +8,7 @@ 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,6 +26,8 @@ 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

@@ -86,7 +86,7 @@ func getRingZeroGatewayID(z *Zone) int {
 			firstNodeID = p.ID
 		}
 
-		if _, found := p.getRingInfo(0); found {
+		if p.IsGateway() {
 			gatewayID = p.ID
 		}
 

pkg/zones/machine.go

@@ -1,24 +1,18 @@
 package zones
 
 import (
-	"fmt"
-	"io/fs"
 	"net/netip"
-	"path/filepath"
 	"strings"
-	"sync"
 )
 
 // A Machine is a machine on a Zone
 type Machine struct {
-	mu sync.Mutex
-
 	zone *Zone
 	ID   int
 	Name string `toml:"name"`
 
 	PublicAddresses []netip.Addr `toml:"public,omitempty"`
-	RingAddresses   []*RingInfo  `toml:"rings,omitempty"`
+	Rings           []*RingInfo  `toml:"rings,omitempty"`
 }
 
 func (m *Machine) String() string {
@@ -39,26 +33,10 @@ func (m *Machine) FullName() string {
 	return m.Name
 }
 
-// ReadFile reads a file from the machine's config directory
+// IsGateway tells if the Machine is a ring0 gateway
-func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
+func (m *Machine) IsGateway() bool {
-	base := m.zone.zones.dir
+	_, ok := m.getRingInfo(0)
-	fullName := m.getFilename(name, args...)
+	return ok
-
-	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...)
 }
 
 func (m *Machine) getPeerByName(name string) (*Machine, bool) {

pkg/zones/machine_file.go

@@ -0,0 +1,87 @@
+package zones
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"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) (io.WriteCloser, error) {
+	return m.openWriter(name, 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) {
+	return m.openWriter(name, 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
+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)
+}
+
+// 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...)
+	}
+
+	s := []string{
+		m.zone.Name,
+		m.Name,
+		name,
+	}
+
+	return filepath.Join(s...)
+}

pkg/zones/machine_rings.go

@@ -3,6 +3,7 @@ package zones
 import (
 	"bytes"
 	"fmt"
+	"io/fs"
 	"os"
 
 	"darvaza.org/core"
@@ -72,6 +73,38 @@ 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
+}
+
 // GetWireguardConfig reads a wgN.conf file
 func (m *Machine) GetWireguardConfig(ring int) (*wireguard.Config, error) {
 	data, err := m.ReadFile("wg%v.conf", ring)
@@ -123,9 +156,9 @@ func (m *Machine) applyWireguardConfig(ring int, wg *wireguard.Config) error {
 }
 
 func (m *Machine) getRingInfo(ring int) (*RingInfo, bool) {
-	for _, ri := range m.RingAddresses {
+	for _, ri := range m.Rings {
 		if ri.Ring == ring {
-			return ri, true
+			return ri, ri.Enabled
 		}
 	}
 
@@ -133,10 +166,10 @@ func (m *Machine) getRingInfo(ring int) (*RingInfo, bool) {
 }
 
 func (m *Machine) applyRingInfo(ring int, new *RingInfo) error {
-	cur, found := m.getRingInfo(ring)
+	cur, _ := m.getRingInfo(ring)
-	if !found {
+	if cur == nil {
 		// first, append
-		m.RingAddresses = append(m.RingAddresses, new)
+		m.Rings = append(m.Rings, new)
 		return nil
 	}
 

pkg/zones/scan.go

@@ -102,9 +102,9 @@ func (m *Zones) scanSort() error {
 	})
 
 	m.ForEachMachine(func(p *Machine) bool {
-		sort.SliceStable(p.RingAddresses, func(i, j int) bool {
+		sort.SliceStable(p.Rings, func(i, j int) bool {
-			ri1 := p.RingAddresses[i]
+			ri1 := p.Rings[i]
-			ri2 := p.RingAddresses[j]
+			ri2 := p.Rings[j]
 
 			return ri1.Ring < ri2.Ring
 		})

pkg/zones/zones.go

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