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:
111
base/notifications/module.go
Normal file
111
base/notifications/module.go
Normal file
@@ -0,0 +1,111 @@
|
||||
package notifications
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"sync/atomic"
|
||||
|
||||
"github.com/safing/portmaster/base/config"
|
||||
"github.com/safing/portmaster/service/mgr"
|
||||
)
|
||||
|
||||
type Notifications struct {
|
||||
mgr *mgr.Manager
|
||||
instance instance
|
||||
|
||||
states *mgr.StateMgr
|
||||
}
|
||||
|
||||
func (n *Notifications) Manager() *mgr.Manager {
|
||||
return n.mgr
|
||||
}
|
||||
|
||||
func (n *Notifications) States() *mgr.StateMgr {
|
||||
return n.states
|
||||
}
|
||||
|
||||
func (n *Notifications) Start() error {
|
||||
if err := prep(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return start()
|
||||
}
|
||||
|
||||
func (n *Notifications) Stop() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func prep() error {
|
||||
return registerConfig()
|
||||
}
|
||||
|
||||
func start() error {
|
||||
err := registerAsDatabase()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
showConfigLoadingErrors()
|
||||
|
||||
module.mgr.Go("cleaner", cleaner)
|
||||
return nil
|
||||
}
|
||||
|
||||
func showConfigLoadingErrors() {
|
||||
validationErrors := config.GetLoadedConfigValidationErrors()
|
||||
if len(validationErrors) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
// Trigger a module error for more awareness.
|
||||
module.states.Add(mgr.State{
|
||||
ID: "config:validation-errors-on-load",
|
||||
Name: "Invalid Settings",
|
||||
Message: "Some current settings are invalid. Please update them and restart the Portmaster.",
|
||||
Type: mgr.StateTypeError,
|
||||
})
|
||||
|
||||
// Send one notification per invalid setting.
|
||||
for _, validationError := range config.GetLoadedConfigValidationErrors() {
|
||||
NotifyError(
|
||||
fmt.Sprintf("config:validation-error:%s", validationError.Option.Key),
|
||||
fmt.Sprintf("Invalid Setting for %s", validationError.Option.Name),
|
||||
fmt.Sprintf(`Your current setting for %s is invalid: %s
|
||||
|
||||
Please update the setting and restart the Portmaster, until then the default value is used.`,
|
||||
validationError.Option.Name,
|
||||
validationError.Err.Error(),
|
||||
),
|
||||
Action{
|
||||
Text: "Change",
|
||||
Type: ActionTypeOpenSetting,
|
||||
Payload: &ActionTypeOpenSettingPayload{
|
||||
Key: validationError.Option.Key,
|
||||
},
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
var (
|
||||
module *Notifications
|
||||
shimLoaded atomic.Bool
|
||||
)
|
||||
|
||||
func New(instance instance) (*Notifications, error) {
|
||||
if !shimLoaded.CompareAndSwap(false, true) {
|
||||
return nil, errors.New("only one instance allowed")
|
||||
}
|
||||
m := mgr.New("Notifications")
|
||||
module = &Notifications{
|
||||
mgr: m,
|
||||
instance: instance,
|
||||
|
||||
states: mgr.NewStateMgr(m),
|
||||
}
|
||||
|
||||
return module, nil
|
||||
}
|
||||
|
||||
type instance interface{}
|
||||
Reference in New Issue
Block a user