mirror of
https://github.com/safing/portmaster
synced 2025-04-08 04:59:10 +00:00
* 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>
235 lines
5.9 KiB
Go
235 lines
5.9 KiB
Go
package config
|
|
|
|
import (
|
|
"errors"
|
|
"sync"
|
|
|
|
"github.com/tevino/abool"
|
|
)
|
|
|
|
var (
|
|
// ErrInvalidJSON is returned by SetConfig and SetDefaultConfig if they receive invalid json.
|
|
ErrInvalidJSON = errors.New("json string invalid")
|
|
|
|
// ErrInvalidOptionType is returned by SetConfigOption and SetDefaultConfigOption if given an unsupported option type.
|
|
ErrInvalidOptionType = errors.New("invalid option value type")
|
|
|
|
validityFlag = abool.NewBool(true)
|
|
validityFlagLock sync.RWMutex
|
|
)
|
|
|
|
// getValidityFlag returns a flag that signifies if the configuration has been changed. This flag must not be changed, only read.
|
|
func getValidityFlag() *abool.AtomicBool {
|
|
validityFlagLock.RLock()
|
|
defer validityFlagLock.RUnlock()
|
|
return validityFlag
|
|
}
|
|
|
|
// signalChanges marks the configs validtityFlag as dirty and eventually
|
|
// triggers a config change event.
|
|
func signalChanges() {
|
|
// reset validity flag
|
|
validityFlagLock.Lock()
|
|
validityFlag.SetTo(false)
|
|
validityFlag = abool.NewBool(true)
|
|
validityFlagLock.Unlock()
|
|
|
|
module.EventConfigChange.Submit(struct{}{})
|
|
}
|
|
|
|
// ValidateConfig validates the given configuration and returns all validation
|
|
// errors as well as whether the given configuration contains unknown keys.
|
|
func ValidateConfig(newValues map[string]interface{}) (validationErrors []*ValidationError, requiresRestart bool, containsUnknown bool) {
|
|
// RLock the options because we are not adding or removing
|
|
// options from the registration but rather only checking the
|
|
// options value which is guarded by the option's lock itself.
|
|
optionsLock.RLock()
|
|
defer optionsLock.RUnlock()
|
|
|
|
var checked int
|
|
for key, option := range options {
|
|
newValue, ok := newValues[key]
|
|
if ok {
|
|
checked++
|
|
|
|
func() {
|
|
option.Lock()
|
|
defer option.Unlock()
|
|
|
|
newValue = migrateValue(option, newValue)
|
|
_, err := validateValue(option, newValue)
|
|
if err != nil {
|
|
validationErrors = append(validationErrors, err)
|
|
}
|
|
|
|
if option.RequiresRestart {
|
|
requiresRestart = true
|
|
}
|
|
}()
|
|
}
|
|
}
|
|
|
|
return validationErrors, requiresRestart, checked < len(newValues)
|
|
}
|
|
|
|
// ReplaceConfig sets the (prioritized) user defined config.
|
|
func ReplaceConfig(newValues map[string]interface{}) (validationErrors []*ValidationError, requiresRestart bool) {
|
|
// RLock the options because we are not adding or removing
|
|
// options from the registration but rather only update the
|
|
// options value which is guarded by the option's lock itself.
|
|
optionsLock.RLock()
|
|
defer optionsLock.RUnlock()
|
|
|
|
for key, option := range options {
|
|
newValue, ok := newValues[key]
|
|
|
|
func() {
|
|
option.Lock()
|
|
defer option.Unlock()
|
|
|
|
option.activeValue = nil
|
|
if ok {
|
|
newValue = migrateValue(option, newValue)
|
|
valueCache, err := validateValue(option, newValue)
|
|
if err == nil {
|
|
option.activeValue = valueCache
|
|
} else {
|
|
validationErrors = append(validationErrors, err)
|
|
}
|
|
}
|
|
handleOptionUpdate(option, true)
|
|
|
|
if option.RequiresRestart {
|
|
requiresRestart = true
|
|
}
|
|
}()
|
|
}
|
|
|
|
signalChanges()
|
|
|
|
return validationErrors, requiresRestart
|
|
}
|
|
|
|
// ReplaceDefaultConfig sets the (fallback) default config.
|
|
func ReplaceDefaultConfig(newValues map[string]interface{}) (validationErrors []*ValidationError, requiresRestart bool) {
|
|
// RLock the options because we are not adding or removing
|
|
// options from the registration but rather only update the
|
|
// options value which is guarded by the option's lock itself.
|
|
optionsLock.RLock()
|
|
defer optionsLock.RUnlock()
|
|
|
|
for key, option := range options {
|
|
newValue, ok := newValues[key]
|
|
|
|
func() {
|
|
option.Lock()
|
|
defer option.Unlock()
|
|
|
|
option.activeDefaultValue = nil
|
|
if ok {
|
|
newValue = migrateValue(option, newValue)
|
|
valueCache, err := validateValue(option, newValue)
|
|
if err == nil {
|
|
option.activeDefaultValue = valueCache
|
|
} else {
|
|
validationErrors = append(validationErrors, err)
|
|
}
|
|
}
|
|
handleOptionUpdate(option, true)
|
|
|
|
if option.RequiresRestart {
|
|
requiresRestart = true
|
|
}
|
|
}()
|
|
}
|
|
|
|
signalChanges()
|
|
|
|
return validationErrors, requiresRestart
|
|
}
|
|
|
|
// SetConfigOption sets a single value in the (prioritized) user defined config.
|
|
func SetConfigOption(key string, value any) error {
|
|
return setConfigOption(key, value, true)
|
|
}
|
|
|
|
func setConfigOption(key string, value any, push bool) (err error) {
|
|
option, err := GetOption(key)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
option.Lock()
|
|
if value == nil {
|
|
option.activeValue = nil
|
|
} else {
|
|
value = migrateValue(option, value)
|
|
valueCache, vErr := validateValue(option, value)
|
|
if vErr == nil {
|
|
option.activeValue = valueCache
|
|
} else {
|
|
err = vErr
|
|
}
|
|
}
|
|
|
|
// Add the "restart pending" annotation if the settings requires a restart.
|
|
if option.RequiresRestart {
|
|
option.setAnnotation(RestartPendingAnnotation, true)
|
|
}
|
|
|
|
handleOptionUpdate(option, push)
|
|
option.Unlock()
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// finalize change, activate triggers
|
|
signalChanges()
|
|
|
|
return SaveConfig()
|
|
}
|
|
|
|
// SetDefaultConfigOption sets a single value in the (fallback) default config.
|
|
func SetDefaultConfigOption(key string, value interface{}) error {
|
|
return setDefaultConfigOption(key, value, true)
|
|
}
|
|
|
|
func setDefaultConfigOption(key string, value interface{}, push bool) (err error) {
|
|
option, err := GetOption(key)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
option.Lock()
|
|
if value == nil {
|
|
option.activeDefaultValue = nil
|
|
} else {
|
|
value = migrateValue(option, value)
|
|
valueCache, vErr := validateValue(option, value)
|
|
if vErr == nil {
|
|
option.activeDefaultValue = valueCache
|
|
} else {
|
|
err = vErr
|
|
}
|
|
}
|
|
|
|
// Add the "restart pending" annotation if the settings requires a restart.
|
|
if option.RequiresRestart {
|
|
option.setAnnotation(RestartPendingAnnotation, true)
|
|
}
|
|
|
|
handleOptionUpdate(option, push)
|
|
option.Unlock()
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// finalize change, activate triggers
|
|
signalChanges()
|
|
|
|
// Do not save the configuration, as it only saves the active values, not the
|
|
// active default value.
|
|
return nil
|
|
}
|