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

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

pkg/zones/machine_rings.go

@@ -10,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)

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)
 		}
 	}