vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-10 14:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix linter errors from netquery implementation

Browse source
This commit is contained in:
Daniel 2022-07-22 14:25:16 +02:00
parent 1889c68d27
commit 90d30c14a5
16 changed files with 163 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

53
netquery/module_api.go
View file

@ -15,7 +15,7 @@ import (
"github.com/safing/portmaster/network"
)
type Module struct {
type module struct {
*modules.Module
db *database.Interface
@ -25,19 +25,19 @@ type Module struct {
}
func init() {
mod := new(Module)
mod.Module = modules.Register(
m := new(module)
m.Module = modules.Register(
"netquery",
mod.Prepare,
mod.Start,
mod.Stop,
m.prepare,
m.start,
m.stop,
"api",
"network",
"database",
)
}
func (m *Module) Prepare() error {
func (m *module) prepare() error {
var err error
m.db = database.NewInterface(&database.Options{
@ -66,7 +66,6 @@ func (m *Module) Prepare() error {
Database: m.sqlStore,
}
// FIXME(ppacher): use appropriate permissions for this
if err := api.RegisterEndpoint(api.Endpoint{
Path: "netquery/query",
MimeType: "application/json",
@ -96,13 +95,15 @@ func (m *Module) Prepare() error {
return nil
}
func (mod *Module) Start() error {
mod.StartServiceWorker("netquery-feeder", time.Second, func(ctx context.Context) error {
sub, err := mod.db.Subscribe(query.New("network:"))
func (m *module) start() error {
m.StartServiceWorker("netquery-feeder", time.Second, func(ctx context.Context) error {
sub, err := m.db.Subscribe(query.New("network:"))
if err != nil {
return fmt.Errorf("failed to subscribe to network tree: %w", err)
}
defer sub.Cancel()
defer func() {
_ = sub.Cancel()
}()
for {
select {
@ -120,24 +121,24 @@ func (mod *Module) Start() error {
continue
}
mod.feed <- conn
m.feed <- conn
}
}
})
mod.StartServiceWorker("netquery-persister", time.Second, func(ctx context.Context) error {
mod.mng.HandleFeed(ctx, mod.feed)
m.StartServiceWorker("netquery-persister", time.Second, func(ctx context.Context) error {
m.mng.HandleFeed(ctx, m.feed)
return nil
})
mod.StartServiceWorker("netquery-row-cleaner", time.Second, func(ctx context.Context) error {
m.StartServiceWorker("netquery-row-cleaner", time.Second, func(ctx context.Context) error {
for {
select {
case <-ctx.Done():
return nil
case <-time.After(10 * time.Second):
threshold := time.Now().Add(-network.DeleteConnsAfterEndedThreshold)
count, err := mod.sqlStore.Cleanup(ctx, threshold)
count, err := m.sqlStore.Cleanup(ctx, threshold)
if err != nil {
log.Errorf("netquery: failed to count number of rows in memory: %s", err)
} else {
@ -147,19 +148,21 @@ func (mod *Module) Start() error {
}
})
// for debugging, we provide a simple direct SQL query interface using
// the runtime database
// FIXME: Expose only in dev mode.
_, err := NewRuntimeQueryRunner(mod.sqlStore, "netquery/query/", runtime.DefaultRegistry)
if err != nil {
return fmt.Errorf("failed to set up runtime SQL query runner: %w", err)
// For debugging, provide a simple direct SQL query interface using
// the runtime database.
// Only expose in development mode.
if config.GetAsBool(config.CfgDevModeKey, false)() {
_, err := NewRuntimeQueryRunner(m.sqlStore, "netquery/query/", runtime.DefaultRegistry)
if err != nil {
return fmt.Errorf("failed to set up runtime SQL query runner: %w", err)
}
}
return nil
}
func (mod *Module) Stop() error {
close(mod.feed)
func (m *module) stop() error {
close(m.feed)
return nil
}