github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructure modules (#1572)

Browse Source 
* 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:
Daniel Hååvi
2024-08-09 17:15:48 +02:00
committed by GitHub
parent 10a77498f4
commit 80664d1a27
647 changed files with 37690 additions and 3366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
service/resolver/resolver-tcp.go
View File

@@ -12,7 +12,8 @@ import (
"github.com/miekg/dns"
"github.com/tevino/abool"
"github.com/safing/portbase/log"
"github.com/safing/portmaster/base/log"
"github.com/safing/portmaster/service/mgr"
"github.com/safing/portmaster/service/netenv"
)
@@ -119,7 +120,7 @@ func (tr *TCPResolver) getOrCreateResolverConn(ctx context.Context) (*tcpResolve
log.Warningf("resolver: heartbeat for dns client %s failed", tr.resolver.Info.DescriptiveName())
case <-ctx.Done():
return nil, ctx.Err()
case <-module.Stopping():
case <-module.mgr.Done():
return nil, ErrShuttingDown
}
} else {
@@ -127,7 +128,7 @@ func (tr *TCPResolver) getOrCreateResolverConn(ctx context.Context) (*tcpResolve
select {
case <-ctx.Done():
return nil, ctx.Err()
case <-module.Stopping():
case <-module.mgr.Done():
return nil, ErrShuttingDown
default:
}
@@ -175,7 +176,7 @@ func (tr *TCPResolver) getOrCreateResolverConn(ctx context.Context) (*tcpResolve
}
// Start worker.
module.StartWorker("dns client", resolverConn.handler)
module.mgr.Go("dns client", resolverConn.handler)
// Set resolver conn for reuse.
tr.resolverConn = resolverConn
@@ -204,7 +205,7 @@ func (tr *TCPResolver) Query(ctx context.Context, q *Query) (*RRCache, error) {
case resolverConn.queries <- tq:
case <-ctx.Done():
return nil, ctx.Err()
case <-module.Stopping():
case <-module.mgr.Done():
return nil, ErrShuttingDown
case <-time.After(defaultRequestTimeout):
return nil, ErrTimeout
@@ -216,7 +217,7 @@ func (tr *TCPResolver) Query(ctx context.Context, q *Query) (*RRCache, error) {
case reply = <-tq.Response:
case <-ctx.Done():
return nil, ctx.Err()
case <-module.Stopping():
case <-module.mgr.Done():
return nil, ErrShuttingDown
case <-time.After(defaultRequestTimeout):
return nil, ErrTimeout
@@ -282,9 +283,9 @@ func (trc *tcpResolverConn) shutdown() {
}
}
func (trc *tcpResolverConn) handler(workerCtx context.Context) error {
func (trc *tcpResolverConn) handler(workerCtx *mgr.WorkerCtx) error {
// Set up context and cleanup.
trc.ctx, trc.cancelCtx = context.WithCancel(workerCtx)
trc.ctx, trc.cancelCtx = context.WithCancel(workerCtx.Ctx())
defer trc.shutdown()
// Set up variables.
@@ -292,7 +293,7 @@ func (trc *tcpResolverConn) handler(workerCtx context.Context) error {
ttlTimer := time.After(defaultClientTTL)
// Start connection reader.
module.StartWorker("dns client reader", trc.reader)
module.mgr.Go("dns client reader", trc.reader)
// Handle requests.
for {
@@ -357,7 +358,7 @@ func (trc *tcpResolverConn) handler(workerCtx context.Context) error {
// assignUniqueID makes sure that ID assigned to msg is unique.
func (trc *tcpResolverConn) assignUniqueID(msg *dns.Msg) {
// try a random ID 10000 times
for i := 0; i < 10000; i++ { // don't try forever
for range 10000 { // don't try forever
_, exists := trc.inFlightQueries[msg.Id]
if !exists {
return // we are unique, yay!
@@ -416,7 +417,7 @@ func (trc *tcpResolverConn) handleQueryResponse(msg *dns.Msg) {
}
}
func (trc *tcpResolverConn) reader(workerCtx context.Context) error {
func (trc *tcpResolverConn) reader(workerCtx *mgr.WorkerCtx) error {
defer trc.cancelCtx()
for {