Restructure modules (#1572)

* Move portbase into monorepo

* Add new simple module mgr

* [WIP] Switch to new simple module mgr

* Add StateMgr and more worker variants

* [WIP] Switch more modules

* [WIP] Switch more modules

* [WIP] swtich more modules

* [WIP] switch all SPN modules

* [WIP] switch all service modules

* [WIP] Convert all workers to the new module system

* [WIP] add new task system to module manager

* [WIP] Add second take for scheduling workers

* [WIP] Add FIXME for bugs in new scheduler

* [WIP] Add minor improvements to scheduler

* [WIP] Add new worker scheduler

* [WIP] Fix more bug related to new module system

* [WIP] Fix start handing of the new module system

* [WIP] Improve startup process

* [WIP] Fix minor issues

* [WIP] Fix missing subsystem in settings

* [WIP] Initialize managers in constructor

* [WIP] Move module event initialization to constrictors

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

* [WIP] Move API registeration into module construction

* [WIP] Update states mgr for all modules

* [WIP] Add CmdLine operation support

* Add state helper methods to module group and instance

* Add notification and module status handling to status package

* Fix starting issues

* Remove pilot widget and update security lock to new status data

* Remove debug logs

* Improve http server shutdown

* Add workaround for cleanly shutting down firewall+netquery

* Improve logging

* Add syncing states with notifications for new module system

* Improve starting, stopping, shutdown; resolve FIXMEs/TODOs

* [WIP] Fix most unit tests

* Review new module system and fix minor issues

* Push shutdown and restart events again via API

* Set sleep mode via interface

* Update example/template module

* [WIP] Fix spn/cabin unit test

* Remove deprecated UI elements

* Make log output more similar for the logging transition phase

* Switch spn hub and observer cmds to new module system

* Fix log sources

* Make worker mgr less error prone

* Fix tests and minor issues

* Fix observation hub

* Improve shutdown and restart handling

* Split up big connection.go source file

* Move varint and dsd packages to structures repo

* Improve expansion test

* Fix linter warnings

* Fix interception module on windows

* Fix linter errors

---------

Co-authored-by: Vladimir Stoilov <vladimir@safing.io>

service/process/api.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/safing/portbase/api"
+	"github.com/safing/portmaster/base/api"
 	"github.com/safing/portmaster/service/profile"
 )
 
@@ -15,7 +15,6 @@ func registerAPIEndpoints() error {
 		Description: "Get information about process tags.",
 		Path:        "process/tags",
 		Read:        api.PermitUser,
-		BelongsTo:   module,
 		StructFunc:  handleProcessTagMetadata,
 	}); err != nil {
 		return err
@@ -26,7 +25,6 @@ func registerAPIEndpoints() error {
 		Description: "Get all recently active processes using the given profile",
 		Path:        "process/list/by-profile/{source:[a-z]+}/{id:[A-z0-9-]+}",
 		Read:        api.PermitUser,
-		BelongsTo:   module,
 		StructFunc:  handleGetProcessesByProfile,
 	}); err != nil {
 		return err
@@ -37,7 +35,6 @@ func registerAPIEndpoints() error {
 		Description: "Load a process group leader by a child PID",
 		Path:        "process/group-leader/{pid:[0-9]+}",
 		Read:        api.PermitUser,
-		BelongsTo:   module,
 		StructFunc:  handleGetProcessGroupLeader,
 	}); err != nil {
 		return err

service/process/config.go

@@ -1,7 +1,7 @@
 package process
 
 import (
-	"github.com/safing/portbase/config"
+	"github.com/safing/portmaster/base/config"
 )
 
 // Configuration Keys.

service/process/database.go

@@ -11,8 +11,8 @@ import (
 	processInfo "github.com/shirou/gopsutil/process"
 	"github.com/tevino/abool"
 
-	"github.com/safing/portbase/database"
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/database"
+	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/profile"
 )
 

service/process/find.go

@@ -6,8 +6,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/safing/portbase/api"
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/api"
+	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/network/netutils"
 	"github.com/safing/portmaster/service/network/packet"
 	"github.com/safing/portmaster/service/network/reference"

service/process/module.go

@@ -1,30 +1,41 @@
 package process
 
 import (
+	"errors"
 	"os"
+	"sync/atomic"
 
-	"github.com/safing/portbase/modules"
+	"github.com/safing/portmaster/service/mgr"
 	"github.com/safing/portmaster/service/updates"
 )
 
-var (
-	module      *modules.Module
-	updatesPath string
-)
-
-func init() {
-	module = modules.Register("processes", prep, start, nil, "profiles", "updates")
+type ProcessModule struct {
+	mgr      *mgr.Manager
+	instance instance
 }
 
-func prep() error {
-	return registerConfiguration()
+func (pm *ProcessModule) Manager() *mgr.Manager {
+	return pm.mgr
 }
 
-func start() error {
+func (pm *ProcessModule) Start() error {
 	updatesPath = updates.RootPath()
 	if updatesPath != "" {
 		updatesPath += string(os.PathSeparator)
 	}
+	return nil
+}
+
+func (pm *ProcessModule) Stop() error {
+	return nil
+}
+
+var updatesPath string
+
+func prep() error {
+	if err := registerConfiguration(); err != nil {
+		return err
+	}
 
 	if err := registerAPIEndpoints(); err != nil {
 		return err
@@ -32,3 +43,28 @@ func start() error {
 
 	return nil
 }
+
+var (
+	module     *ProcessModule
+	shimLoaded atomic.Bool
+)
+
+// New returns a new Process module.
+func New(instance instance) (*ProcessModule, error) {
+	if !shimLoaded.CompareAndSwap(false, true) {
+		return nil, errors.New("only one instance allowed")
+	}
+
+	m := mgr.New("ProcessModule")
+	module = &ProcessModule{
+		mgr:      m,
+		instance: instance,
+	}
+
+	if err := prep(); err != nil {
+		return nil, err
+	}
+	return module, nil
+}
+
+type instance interface{}

service/process/module_test.go

@@ -1,11 +0,0 @@
-package process
-
-import (
-	"testing"
-
-	"github.com/safing/portmaster/service/core/pmtesting"
-)
-
-func TestMain(m *testing.M) {
-	pmtesting.TestMain(m, module)
-}

service/process/process.go

@@ -13,8 +13,8 @@ import (
 	processInfo "github.com/shirou/gopsutil/process"
 	"golang.org/x/sync/singleflight"
 
-	"github.com/safing/portbase/database/record"
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/database/record"
+	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/profile"
 )
 

service/process/process_linux.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/log"
 )
 
 const (

service/process/profile.go

@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/profile"
 )
 

service/process/special.go

@@ -6,7 +6,7 @@ import (
 
 	"golang.org/x/sync/singleflight"
 
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/network/socket"
 	"github.com/safing/portmaster/service/profile"
 )

service/process/tags/appimage_unix.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/process"
 	"github.com/safing/portmaster/service/profile"
 	"github.com/safing/portmaster/service/profile/binmeta"

service/process/tags/svchost_windows.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/safing/portbase/log"
-	"github.com/safing/portbase/utils/osdetail"
+	"github.com/safing/portmaster/base/log"
+	"github.com/safing/portmaster/base/utils/osdetail"
 	"github.com/safing/portmaster/service/process"
 	"github.com/safing/portmaster/service/profile"
 	"github.com/safing/portmaster/service/profile/binmeta"

service/process/tags/winstore_windows.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/safing/portbase/log"
-	"github.com/safing/portbase/utils"
+	"github.com/safing/portmaster/base/log"
+	"github.com/safing/portmaster/base/utils"
 	"github.com/safing/portmaster/service/process"
 	"github.com/safing/portmaster/service/profile"
 	"github.com/safing/portmaster/service/profile/binmeta"