common method for mesh pk cleanup

cmd/daemon/main.go

@@ -109,25 +109,6 @@ const (
 	sockTCP socketType = "tcp"
 )
 
-func meshPrivateKeyCleanup(configManager config.Manager) {
-	var cfg config.Config
-	err := configManager.Load(&cfg)
-	if err != nil {
-		log.Println(internal.ErrorPrefix, "failed to load config for shutdown operations:", err)
-		return
-	}
-
-	if !cfg.Mesh && cfg.MeshPrivateKey != "" {
-		err := configManager.SaveWith(func(c config.Config) config.Config {
-			c.MeshPrivateKey = ""
-			return c
-		})
-		if err != nil {
-			log.Println(internal.ErrorPrefix, "failed to clean up mesh private key on shutdown:", err)
-		}
-	}
-}
-
 func main() {
 	// pprof
 	if internal.IsDevEnv(Environment) {
@@ -639,5 +620,9 @@ func main() {
 		log.Println(internal.ErrorPrefix, "stopping KillSwitch:", err)
 	}
 
-	meshPrivateKeyCleanup(fsystem)
+	if err := fsystem.Load(&cfg); err != nil {
+		log.Println(internal.ErrorPrefix, "loading config at shutdown for mesh private key cleanup: %w", err)
+	} else {
+		daemon.MeshPrivateKeyCleanup(cfg, fsystem)
+	}
 }

daemon/rpc_disconnect.go

@@ -1,6 +1,7 @@
 package daemon
 
 import (
+	"fmt"
 	"log"
 
 	"github.com/NordSecurity/nordvpn-linux/config"
@@ -9,6 +10,20 @@ import (
 	"github.com/NordSecurity/nordvpn-linux/internal"
 )
 
+func MeshPrivateKeyCleanup(cfg config.Config, configManager config.Manager) error {
+	if !cfg.Mesh && cfg.MeshPrivateKey != "" {
+		err := configManager.SaveWith(func(c config.Config) config.Config {
+			c.MeshPrivateKey = ""
+			return c
+		})
+		if err != nil {
+			return fmt.Errorf("saving config: %w", err)
+		}
+	}
+
+	return nil
+}
+
 func (r *RPC) Disconnect(_ *pb.Empty, srv pb.Daemon_DisconnectServer) error {
 	if !r.netw.IsVPNActive() {
 		if err := r.netw.UnsetFirewall(); err != nil {
@@ -29,14 +44,8 @@ func (r *RPC) Disconnect(_ *pb.Empty, srv pb.Daemon_DisconnectServer) error {
 		log.Println(internal.ErrorPrefix, err)
 	}
 
-	if !cfg.Mesh && cfg.MeshPrivateKey != "" {
-		err := r.cm.SaveWith(func(c config.Config) config.Config {
-			c.MeshPrivateKey = ""
-			return c
-		})
-		if err != nil {
-			log.Println(internal.ErrorPrefix, "failed to clean up mesh private key:", err)
-		}
+	if err := MeshPrivateKeyCleanup(cfg, r.cm); err != nil {
+		log.Println(internal.ErrorPrefix, "cleaning up meshnet private key:", err)
 	}
 
 	r.events.Service.Disconnect.Publish(events.DataDisconnect{