mirror of
https://github.com/safing/portmaster
synced 2025-04-19 10:29:11 +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>
77 lines
2.5 KiB
Go
77 lines
2.5 KiB
Go
package netquery
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/safing/portmaster/base/database/record"
|
|
"github.com/safing/portmaster/base/log"
|
|
"github.com/safing/portmaster/base/runtime"
|
|
"github.com/safing/portmaster/service/netquery/orm"
|
|
"github.com/safing/structures/dsd"
|
|
)
|
|
|
|
// RuntimeQueryRunner provides a simple interface for the runtime database
|
|
// that allows direct SQL queries to be performed against db.
|
|
// Each resulting row of that query are marshaled as map[string]interface{}
|
|
// and returned as a single record to the caller.
|
|
//
|
|
// Using portbase/database#Query is not possible because portbase/database will
|
|
// complain about the SQL query being invalid. To work around that issue,
|
|
// RuntimeQueryRunner uses a 'GET key' request where the SQL query is embedded into
|
|
// the record key.
|
|
type RuntimeQueryRunner struct {
|
|
db *Database
|
|
reg *runtime.Registry
|
|
keyPrefix string
|
|
}
|
|
|
|
// NewRuntimeQueryRunner returns a new runtime SQL query runner that parses
|
|
// and serves SQL queries form GET <prefix>/<plain sql query> requests.
|
|
func NewRuntimeQueryRunner(db *Database, prefix string, reg *runtime.Registry) (*RuntimeQueryRunner, error) {
|
|
runner := &RuntimeQueryRunner{
|
|
db: db,
|
|
reg: reg,
|
|
keyPrefix: prefix,
|
|
}
|
|
|
|
if _, err := reg.Register(prefix, runtime.SimpleValueGetterFunc(runner.get)); err != nil {
|
|
return nil, fmt.Errorf("failed to register runtime value provider: %w", err)
|
|
}
|
|
|
|
return runner, nil
|
|
}
|
|
|
|
func (runner *RuntimeQueryRunner) get(keyOrPrefix string) ([]record.Record, error) {
|
|
query := strings.TrimPrefix(
|
|
keyOrPrefix,
|
|
runner.keyPrefix,
|
|
)
|
|
|
|
log.Infof("netquery: executing custom SQL query: %q", query)
|
|
|
|
var result []map[string]interface{}
|
|
if err := runner.db.Execute(context.Background(), query, orm.WithResult(&result)); err != nil {
|
|
return nil, fmt.Errorf("failed to perform query %q: %w", query, err)
|
|
}
|
|
|
|
// we need to wrap the result slice into a map as portbase/database attempts
|
|
// to inject a _meta field.
|
|
blob, err := json.Marshal(map[string]interface{}{
|
|
"result": result,
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to marshal result: %w", err)
|
|
}
|
|
|
|
// construct a new record wrapper that uses the already prepared JSON blob.
|
|
key := fmt.Sprintf("%s:%s", runner.reg.DatabaseName(), keyOrPrefix)
|
|
wrapper, err := record.NewWrapper(key, new(record.Meta), dsd.JSON, blob)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to create record wrapper: %w", err)
|
|
}
|
|
|
|
return []record.Record{wrapper}, nil
|
|
}
|