[WIP] Fix setting for enabling and disabling the SPN module

base/api/module.go

@@ -22,9 +22,6 @@ func (api *API) Manager() *mgr.Manager {
 
 // Start starts the module.
 func (api *API) Start() error {
-	if err := prep(); err != nil {
-		return err
-	}
 	if err := start(); err != nil {
 		return err
 	}
@@ -54,6 +51,9 @@ func New(instance instance) (*API, error) {
 		instance: instance,
 	}
 
+	if err := prep(); err != nil {
+		return nil, err
+	}
 	return module, nil
 }
 

base/config/module.go

@@ -22,9 +22,6 @@ func (u *Config) Manager() *mgr.Manager {
 
 // Start starts the module.
 func (u *Config) Start() error {
-	if err := prep(); err != nil {
-		return err
-	}
 	return start()
 }
 
@@ -49,6 +46,11 @@ func New(instance instance) (*Config, error) {
 		instance:          instance,
 		EventConfigChange: mgr.NewEventMgr[struct{}](ChangeEvent, m),
 	}
+
+	if err := prep(); err != nil {
+		return nil, err
+	}
+
 	return module, nil
 }
 

base/metrics/module.go

@@ -22,9 +22,6 @@ func (met *Metrics) Manager() *mgr.Manager {
 }
 
 func (met *Metrics) Start() error {
-	if err := prepConfig(); err != nil {
-		return err
-	}
 	return start()
 }
 
@@ -202,6 +199,9 @@ func New(instance instance) (*Metrics, error) {
 		mgr:      m,
 		instance: instance,
 	}
+	if err := prepConfig(); err != nil {
+		return nil, err
+	}
 
 	return module, nil
 }

service/firewall/module.go

@@ -103,10 +103,6 @@ func prep() error {
 		return false, err
 	})
 
-	if err := registerConfig(); err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -149,6 +145,10 @@ func New(instance instance) (*Firewall, error) {
 		return nil, err
 	}
 
+	if err := registerConfig(); err != nil {
+		return nil, err
+	}
+
 	return module, nil
 }
 

service/instance.go

@@ -58,22 +58,10 @@ type Instance struct {
 	rng           *rng.Rng
 	base          *base.Base
 
-	core    *core.Core
-	updates *updates.Updates
-	geoip   *geoip.GeoIP
-	netenv  *netenv.NetEnv
-
-	access    *access.Access
-	cabin     *cabin.Cabin
-	navigator *navigator.Navigator
-	captain   *captain.Captain
-	crew      *crew.Crew
-	docks     *docks.Docks
-	patrol    *patrol.Patrol
-	ships     *ships.Ships
-	sluice    *sluice.SluiceModule
-	terminal  *terminal.TerminalModule
-
+	core         *core.Core
+	updates      *updates.Updates
+	geoip        *geoip.GeoIP
+	netenv       *netenv.NetEnv
 	ui           *ui.UI
 	profile      *profile.ProfileModule
 	network      *network.Network
@@ -89,6 +77,20 @@ type Instance struct {
 	process      *process.ProcessModule
 	resolver     *resolver.ResolverModule
 	sync         *sync.Sync
+
+	access *access.Access
+
+	// SPN modules
+	SpnGroup  *mgr.Group
+	cabin     *cabin.Cabin
+	navigator *navigator.Navigator
+	captain   *captain.Captain
+	crew      *crew.Crew
+	docks     *docks.Docks
+	patrol    *patrol.Patrol
+	ships     *ships.Ships
+	sluice    *sluice.SluiceModule
+	terminal  *terminal.TerminalModule
 }
 
 // New returns a new portmaster service instance.
@@ -134,7 +136,7 @@ func New(version string, svcCfg *ServiceConfig) (*Instance, error) {
 		return nil, fmt.Errorf("create base module: %w", err)
 	}
 
-	// Global service modules
+	// Service modules
 	instance.core, err = core.New(instance)
 	if err != nil {
 		return nil, fmt.Errorf("create core module: %w", err)
@@ -151,50 +153,6 @@ func New(version string, svcCfg *ServiceConfig) (*Instance, error) {
 	if err != nil {
 		return nil, fmt.Errorf("create netenv module: %w", err)
 	}
-
-	// SPN modules
-	instance.access, err = access.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create access module: %w", err)
-	}
-	instance.cabin, err = cabin.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create cabin module: %w", err)
-	}
-	instance.navigator, err = navigator.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create navigator module: %w", err)
-	}
-	instance.captain, err = captain.New(instance, svcCfg.ShutdownFunc)
-	if err != nil {
-		return nil, fmt.Errorf("create captain module: %w", err)
-	}
-	instance.crew, err = crew.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create crew module: %w", err)
-	}
-	instance.docks, err = docks.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create docks module: %w", err)
-	}
-	instance.patrol, err = patrol.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create patrol module: %w", err)
-	}
-	instance.ships, err = ships.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create ships module: %w", err)
-	}
-	instance.sluice, err = sluice.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create sluice module: %w", err)
-	}
-	instance.terminal, err = terminal.New(instance)
-	if err != nil {
-		return nil, fmt.Errorf("create terminal module: %w", err)
-	}
-
-	// Service modules
 	instance.ui, err = ui.New(instance)
 	if err != nil {
 		return nil, fmt.Errorf("create ui module: %w", err)
@@ -255,6 +213,48 @@ func New(version string, svcCfg *ServiceConfig) (*Instance, error) {
 	if err != nil {
 		return nil, fmt.Errorf("create sync module: %w", err)
 	}
+	instance.access, err = access.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create access module: %w", err)
+	}
+
+	// SPN modules
+	instance.cabin, err = cabin.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create cabin module: %w", err)
+	}
+	instance.navigator, err = navigator.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create navigator module: %w", err)
+	}
+	instance.captain, err = captain.New(instance, svcCfg.ShutdownFunc)
+	if err != nil {
+		return nil, fmt.Errorf("create captain module: %w", err)
+	}
+	instance.crew, err = crew.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create crew module: %w", err)
+	}
+	instance.docks, err = docks.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create docks module: %w", err)
+	}
+	instance.patrol, err = patrol.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create patrol module: %w", err)
+	}
+	instance.ships, err = ships.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create ships module: %w", err)
+	}
+	instance.sluice, err = sluice.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create sluice module: %w", err)
+	}
+	instance.terminal, err = terminal.New(instance)
+	if err != nil {
+		return nil, fmt.Errorf("create terminal module: %w", err)
+	}
 
 	// Add all modules to instance group.
 	instance.Group = mgr.NewGroup(
@@ -272,17 +272,6 @@ func New(version string, svcCfg *ServiceConfig) (*Instance, error) {
 		instance.geoip,
 		instance.netenv,
 
-		instance.access,
-		instance.cabin,
-		instance.navigator,
-		instance.captain,
-		instance.crew,
-		instance.docks,
-		instance.patrol,
-		instance.ships,
-		instance.sluice,
-		instance.terminal,
-
 		instance.ui,
 		instance.profile,
 		instance.network,
@@ -298,6 +287,20 @@ func New(version string, svcCfg *ServiceConfig) (*Instance, error) {
 		instance.process,
 		instance.resolver,
 		instance.sync,
+		instance.access,
+	)
+
+	// SPN Group
+	instance.SpnGroup = mgr.NewGroup(
+		instance.cabin,
+		instance.navigator,
+		instance.captain,
+		instance.crew,
+		instance.docks,
+		instance.patrol,
+		instance.ships,
+		instance.sluice,
+		instance.terminal,
 	)
 
 	// FIXME: call this before to trigger shutdown/restart event
@@ -502,6 +505,11 @@ func (i *Instance) Core() *core.Core {
 	return i.core
 }
 
+// SPNGroup returns the group of all SPN modules.
+func (i *Instance) SPNGroup() *mgr.Group {
+	return i.SpnGroup
+}
+
 // Events
 // SPN connected
 func (i *Instance) GetEventSPNConnected() *mgr.EventMgr[struct{}] {

service/intel/customlists/module.go

@@ -61,12 +61,6 @@ var (
 func prep() error {
 	initFilterLists()
 
-	// Register the config in the ui.
-	err := registerConfig()
-	if err != nil {
-		return err
-	}
-
 	// Register api endpoint for updating the filter list.
 	if err := api.RegisterEndpoint(api.Endpoint{
 		Path:  "customlists/update",
@@ -226,6 +220,12 @@ func New(instance instance) (*CustomList, error) {
 		States:                    mgr.NewStateMgr(m),
 		updateFilterListWorkerMgr: m.NewWorkerMgr("update custom filter list", checkAndUpdateFilterList, nil),
 	}
+	// Register the config in the ui.
+	err := registerConfig()
+	if err != nil {
+		return nil, err
+	}
+
 	return module, nil
 }
 

service/nameserver/module.go

@@ -31,9 +31,6 @@ func (ns *NameServer) Manager() *mgr.Manager {
 }
 
 func (ns *NameServer) Start() error {
-	if err := prep(); err != nil {
-		return err
-	}
 	return start()
 }
 
@@ -325,6 +322,10 @@ func New(instance instance) (*NameServer, error) {
 
 		States: mgr.NewStateMgr(m),
 	}
+	if err := prep(); err != nil {
+		return nil, err
+	}
+
 	return module, nil
 }
 

service/process/module.go

@@ -19,10 +19,6 @@ func (pm *ProcessModule) Manager() *mgr.Manager {
 }
 
 func (pm *ProcessModule) Start() error {
-	if err := prep(); err != nil {
-		return err
-	}
-
 	return start()
 }
 
@@ -68,6 +64,10 @@ func New(instance instance) (*ProcessModule, error) {
 		mgr:      m,
 		instance: instance,
 	}
+
+	if err := prep(); err != nil {
+		return nil, err
+	}
 	return module, nil
 }
 

service/profile/module.go

@@ -45,10 +45,6 @@ func (pm *ProfileModule) Manager() *mgr.Manager {
 }
 
 func (pm *ProfileModule) Start() error {
-	if err := prep(); err != nil {
-		return err
-	}
-
 	return start()
 }
 
@@ -151,6 +147,10 @@ func NewModule(instance instance) (*ProfileModule, error) {
 		States: mgr.NewStateMgr(m),
 	}
 
+	if err := prep(); err != nil {
+		return nil, err
+	}
+
 	return module, nil
 }
 

service/updates/main.go

@@ -85,10 +85,6 @@ func init() {
 }
 
 func prep() error {
-	if err := registerConfig(); err != nil {
-		return err
-	}
-
 	// Check if update server URL supplied via flag is a valid URL.
 	if updateServerFromFlag != "" {
 		u, err := url.Parse(updateServerFromFlag)