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>
This commit is contained in:
Daniel Hååvi
2024-08-09 17:15:48 +02:00
committed by GitHub
parent 10a77498f4
commit 80664d1a27
647 changed files with 37690 additions and 3366 deletions

View File

@@ -1,10 +1,13 @@
package netenv
import (
"errors"
"sync/atomic"
"github.com/tevino/abool"
"github.com/safing/portbase/log"
"github.com/safing/portbase/modules"
"github.com/safing/portmaster/base/log"
"github.com/safing/portmaster/service/mgr"
)
// Event Names.
@@ -14,12 +17,34 @@ const (
OnlineStatusChangedEvent = "online status changed"
)
var module *modules.Module
type NetEnv struct {
m *mgr.Manager
instance instance
func init() {
module = modules.Register(ModuleName, prep, start, nil)
module.RegisterEvent(NetworkChangedEvent, true)
module.RegisterEvent(OnlineStatusChangedEvent, true)
EventNetworkChange *mgr.EventMgr[struct{}]
EventOnlineStatusChange *mgr.EventMgr[OnlineStatus]
}
func (ne *NetEnv) Manager() *mgr.Manager {
return ne.m
}
func (ne *NetEnv) Start() error {
ne.m.Go(
"monitor network changes",
monitorNetworkChanges,
)
ne.m.Go(
"monitor online status",
monitorOnlineStatus,
)
return nil
}
func (ne *NetEnv) Stop() error {
return nil
}
func prep() error {
@@ -36,22 +61,6 @@ func prep() error {
return prepLocation()
}
func start() error {
module.StartServiceWorker(
"monitor network changes",
0,
monitorNetworkChanges,
)
module.StartServiceWorker(
"monitor online status",
0,
monitorOnlineStatus,
)
return nil
}
var ipv6Enabled = abool.NewBool(true)
// IPv6Enabled returns whether the device has an active IPv6 stack.
@@ -70,3 +79,30 @@ func checkForIPv6Stack() {
// Set IPv6 as enabled if any IPv6 addresses are found.
ipv6Enabled.SetTo(len(v6IPs) > 0)
}
var (
module *NetEnv
shimLoaded atomic.Bool
)
// New returns a new NetEnv module.
func New(instance instance) (*NetEnv, error) {
if !shimLoaded.CompareAndSwap(false, true) {
return nil, errors.New("only one instance allowed")
}
m := mgr.New("NetEnv")
module = &NetEnv{
m: m,
instance: instance,
EventNetworkChange: mgr.NewEventMgr[struct{}]("network change", m),
EventOnlineStatusChange: mgr.NewEventMgr[OnlineStatus]("online status change", m),
}
if err := prep(); err != nil {
return nil, err
}
return module, nil
}
type instance interface{}