zones: WIP

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

cmd/jpictl/env.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+
+	"git.jpi.io/amery/jpictl/pkg/zones"
+)
+
+// Command
+var envCmd = &cobra.Command{
+	Use:   "env",
+	Short: "generates environment variables for shell scripts",
+	RunE: func(_ *cobra.Command, _ []string) error {
+		m, err := zones.New(cfg.Base, cfg.Domain)
+		if err != nil {
+			return err
+		}
+
+		return m.WriteEnv(os.Stdout)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(envCmd)
+}

pkg/zones/address.go

@@ -0,0 +1,49 @@
+package zones
+
+import "net/netip"
+
+// ParseRingZeroAddress extracts zone and node ID from a wg0 [netip.Addr]
+func ParseRingZeroAddress(addr netip.Addr) (zoneID int, nodeID int, ok bool) {
+	if addr.IsValid() {
+		a4 := addr.As4()
+
+		if a4[0] == 10 && a4[1] == 0 {
+			return int(a4[2]), int(a4[3]), true
+		}
+	}
+	return 0, 0, false
+}
+
+// RingZeroAddress returns a wg0 IP address
+func RingZeroAddress(zoneID, nodeID int) netip.Addr {
+	c := zoneID
+	d := nodeID
+
+	return netip.AddrFrom4([4]byte{
+		10, 0, uint8(c), uint8(d),
+	})
+}
+
+// ParseRingOneAddress extracts zone and node ID from a wg1 [netip.Addr]
+func ParseRingOneAddress(addr netip.Addr) (zoneID int, nodeID int, ok bool) {
+	if addr.IsValid() {
+		a4 := addr.As4()
+
+		if a4[0] == 10 && a4[2] == 0 {
+			zoneID = int(a4[1] >> 4)
+			nodeID = int(a4[3])
+			return zoneID, nodeID, true
+		}
+	}
+	return 0, 0, false
+}
+
+// RingOneAddress returns a wg1 IP address
+func RingOneAddress(zoneID, nodeID int) netip.Addr {
+	b := zoneID << 4
+	d := nodeID
+
+	return netip.AddrFrom4([4]byte{
+		10, uint8(b), 0, uint8(d),
+	})
+}

pkg/zones/env.go

@@ -0,0 +1,9 @@
+// Package zones abstracts the cluster zones
+package zones
+
+import "io"
+
+// WriteEnv generates environment variables for shell scripts
+func (*Zones) WriteEnv(io.Writer) error {
+	return nil
+}

pkg/zones/machine_scan.go

@@ -1,11 +1,86 @@
 package zones
 
 import (
+	"bytes"
 	"context"
+	"fmt"
+	"log"
 	"net/netip"
+	"os"
 	"time"
+
+	"git.jpi.io/amery/jpictl/pkg/wireguard"
 )
 
+// GetWireguardConfig reads a wgN.conf file
+func (m *Machine) GetWireguardConfig(ring int) (*wireguard.Config, error) {
+	data, err := m.ReadFile("wg%v.conf", ring)
+	if err != nil {
+		return nil, err
+	}
+
+	r := bytes.NewReader(data)
+	return wireguard.NewConfigFromReader(r)
+}
+
+func (m *Machine) tryWireguardZeroConfig() error {
+	wg, err := m.GetWireguardConfig(0)
+	switch {
+	case os.IsNotExist(err):
+		return nil
+	case err != nil:
+		return err
+	default:
+		return m.applyWireguardZeroConfig(wg)
+	}
+}
+
+func (m *Machine) applyWireguardZeroConfig(wg *wireguard.Config) error {
+	addr := wg.GetAddress()
+	zoneID, nodeID, ok := ParseRingZeroAddress(addr)
+	if !ok {
+		return fmt.Errorf("%s: invalid %s address: %s", m.Name, "wg1", addr)
+	}
+
+	if err := m.applyZoneNodeID(zoneID, nodeID); err != nil {
+		return err
+	}
+
+	log.Println(m.Name, "wg0", addr, zoneID, nodeID)
+	return nil
+}
+
+func (m *Machine) tryWireguardOneConfig() error {
+	wg, err := m.GetWireguardConfig(1)
+	switch {
+	case os.IsNotExist(err):
+		return nil
+	case err != nil:
+		return err
+	default:
+		return m.applyWireguardOneConfig(wg)
+	}
+}
+
+func (m *Machine) applyWireguardOneConfig(wg *wireguard.Config) error {
+	addr := wg.GetAddress()
+	zoneID, nodeID, ok := ParseRingOneAddress(addr)
+	if !ok {
+		return fmt.Errorf("%s: invalid %s address: %s", m.Name, "wg1", addr)
+	}
+
+	if err := m.applyZoneNodeID(zoneID, nodeID); err != nil {
+		return err
+	}
+
+	log.Println(m.Name, "wg1", addr, zoneID, nodeID)
+	return nil
+}
+
+func (*Machine) applyZoneNodeID(_, _ int) error {
+	return nil
+}
+
 func (m *Machine) lookupNetIP() ([]netip.Addr, error) {
 	timeout := 2 * time.Second
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
@@ -26,5 +101,13 @@ func (m *Machine) updatePublicAddresses() error {
 }
 
 func (m *Machine) scan() error {
+	if err := m.tryWireguardZeroConfig(); err != nil {
+		return err
+	}
+
+	if err := m.tryWireguardOneConfig(); err != nil {
+		return err
+	}
+
 	return m.updatePublicAddresses()
 }

pkg/zones/scan.go

@@ -26,7 +26,17 @@ func (m *Zones) scan() error {
 		}
 	}
 
-	return nil
+	return m.scanMachines()
+}
+
+func (m *Zones) scanMachines() error {
+	var err error
+	m.ForEachMachine(func(p *Machine) {
+		if err == nil {
+			err = p.scan()
+		}
+	})
+	return err
 }
 
 func (z *Zone) scan() error {
@@ -47,15 +57,5 @@ func (z *Zone) scan() error {
 		}
 	}
 
-	return z.scanMachines()
-}
-
-func (z *Zone) scanMachines() error {
-	var err error
-	z.zones.ForEachMachine(func(m *Machine) {
-		if err == nil {
-			err = m.scan()
-		}
-	})
-	return err
+	return nil
 }

pkg/zones/zones.go

@@ -49,9 +49,11 @@ func (m *Zones) ForEachZone(fn func(*Zone)) {
 
 // NewFS builds a [Zones] tree using the given directory
 func NewFS(dir fs.FS, domain string) (*Zones, error) {
+	lockuper := resolver.NewCloudflareLookuper()
+
 	z := &Zones{
 		dir:      dir,
-		resolver: resolver.SystemResolver(true),
+		resolver: resolver.NewResolver(lockuper),
 		domain:   domain,
 	}