mirror of
https://github.com/safing/portmaster
synced 2025-04-07 20:49: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>
97 lines
1.5 KiB
Go
97 lines
1.5 KiB
Go
package config
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"testing"
|
|
)
|
|
|
|
var (
|
|
jsonData = `{
|
|
"a": "b",
|
|
"c": {
|
|
"d": "e",
|
|
"f": "g",
|
|
"h": {
|
|
"i": "j",
|
|
"k": "l",
|
|
"m": {
|
|
"n": "o"
|
|
}
|
|
}
|
|
},
|
|
"p": "q"
|
|
}`
|
|
jsonBytes = []byte(jsonData)
|
|
|
|
mapData = map[string]interface{}{
|
|
"a": "b",
|
|
"p": "q",
|
|
"c/d": "e",
|
|
"c/f": "g",
|
|
"c/h/i": "j",
|
|
"c/h/k": "l",
|
|
"c/h/m/n": "o",
|
|
}
|
|
)
|
|
|
|
func TestJSONMapConversion(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// convert to json
|
|
j, err := MapToJSON(mapData)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// check if to json matches
|
|
if !bytes.Equal(jsonBytes, j) {
|
|
t.Errorf("json does not match, got %s", j)
|
|
}
|
|
|
|
// convert to map
|
|
m, err := JSONToMap(jsonBytes)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// and back
|
|
j2, err := MapToJSON(m)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// check if double convert matches
|
|
if !bytes.Equal(jsonBytes, j2) {
|
|
t.Errorf("json does not match, got %s", j)
|
|
}
|
|
}
|
|
|
|
func TestConfigCleaning(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// load
|
|
configFlat, err := JSONToMap(jsonBytes)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// clean everything
|
|
CleanFlattenedConfig(configFlat)
|
|
if len(configFlat) != 0 {
|
|
t.Errorf("should be empty: %+v", configFlat)
|
|
}
|
|
|
|
// load manuall for hierarchical config
|
|
configHier := make(map[string]interface{})
|
|
err = json.Unmarshal(jsonBytes, &configHier)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// clean everything
|
|
CleanHierarchicalConfig(configHier)
|
|
if len(configHier) != 0 {
|
|
t.Errorf("should be empty: %+v", configHier)
|
|
}
|
|
}
|