Replace dataroot module with BinDir and DataDir on instance, adapt modules

cmds/portmaster-core/main.go

@@ -1,47 +1,49 @@
 package main
 
 import (
-	"bufio"
-	"errors"
 	"flag"
 	"fmt"
-	"io"
-	"log/slog"
 	"os"
 	"runtime"
-	"runtime/pprof"
-	"syscall"
+
+	"github.com/spf13/cobra"
 
 	"github.com/safing/portmaster/base/info"
 	"github.com/safing/portmaster/base/metrics"
 	"github.com/safing/portmaster/service"
-	"github.com/safing/portmaster/service/mgr"
 	"github.com/safing/portmaster/service/updates"
-	"github.com/safing/portmaster/spn/conf"
 )
 
 var (
-	printStackOnExit   bool
-	enableInputSignals bool
+	rootCmd = &cobra.Command{
+		Use:              "portmaster-core",
+		PersistentPreRun: initializeGlobals,
+		Run:              cmdRun,
+	}
 
-	sigUSR1 = syscall.Signal(0xa) // dummy for windows
+	binDir  string
+	dataDir string
+
+	svcCfg *service.ServiceConfig
 )
 
 func init() {
-	flag.BoolVar(&printStackOnExit, "print-stack-on-exit", false, "prints the stack before of shutting down")
-	flag.BoolVar(&enableInputSignals, "input-signals", false, "emulate signals using stdin")
+	// Add Go's default flag set.
+	rootCmd.Flags().AddGoFlagSet(flag.CommandLine)
+
+	// Add persisent flags for all commands.
+	rootCmd.PersistentFlags().StringVar(&binDir, "bin-dir", "", "set directory for executable binaries (rw/ro)")
+	rootCmd.PersistentFlags().StringVar(&dataDir, "data-dir", "", "set directory for variable data (rw)")
 }
 
 func main() {
-	flag.Parse()
-	// Call platform specific checks, that will execute commands like "recover-iptables"
-	platformSpecificChecks()
-
-	instance := initialize()
-	run(instance)
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 }
 
-func initialize() *service.Instance {
+func initializeGlobals(cmd *cobra.Command, args []string) {
 	// set information
 	info.Set("Portmaster", "", "GPLv3")
 
@@ -51,66 +53,13 @@ func initialize() *service.Instance {
 	// Configure user agent.
 	updates.UserAgent = fmt.Sprintf("Portmaster Core (%s %s)", runtime.GOOS, runtime.GOARCH)
 
-	// enable SPN client mode
-	conf.EnableClient(true)
-	conf.EnableIntegration(true)
-
-	// Create instance.
-	var execCmdLine bool
-	instance, err := service.New(&service.ServiceConfig{})
-	switch {
-	case err == nil:
-		// Continue
-	case errors.Is(err, mgr.ErrExecuteCmdLineOp):
-		execCmdLine = true
-	default:
-		fmt.Printf("error creating an instance: %s\n", err)
-		os.Exit(2)
-	}
-
-	// Execute command line operation, if requested or available.
-	switch {
-	case !execCmdLine:
-		// Run service.
-	case instance.CommandLineOperation == nil:
-		fmt.Println("command line operation execution requested, but not set")
-		os.Exit(3)
-	default:
-		// Run the function and exit.
-		err = instance.CommandLineOperation()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "command line operation failed: %s\n", err)
-			os.Exit(3)
-		}
-		os.Exit(0)
-	}
-	return instance
-}
-
-func printStackTo(writer io.Writer, msg string) {
-	_, err := fmt.Fprintf(writer, "===== %s =====\n", msg)
-	if err == nil {
-		err = pprof.Lookup("goroutine").WriteTo(writer, 1)
-	}
-	if err != nil {
-		slog.Error("failed to write stack trace", "err", err)
-	}
-}
-
-func inputSignals(signalCh chan os.Signal) {
-	scanner := bufio.NewScanner(os.Stdin)
-	for scanner.Scan() {
-		switch scanner.Text() {
-		case "SIGHUP":
-			signalCh <- syscall.SIGHUP
-		case "SIGINT":
-			signalCh <- syscall.SIGINT
-		case "SIGQUIT":
-			signalCh <- syscall.SIGQUIT
-		case "SIGTERM":
-			signalCh <- syscall.SIGTERM
-		case "SIGUSR1":
-			signalCh <- sigUSR1
-		}
+	// Create service config.
+	svcCfg = &service.ServiceConfig{
+		BinDir:              binDir,
+		DataDir:             dataDir,
+		BinariesIndexURLs:   service.DefaultBinaryIndexURLs,
+		IntelIndexURLs:      service.DefaultIntelIndexURLs,
+		VerifyBinaryUpdates: service.BinarySigningTrustStore,
+		VerifyIntelUpdates:  service.BinarySigningTrustStore,
 	}
 }