mirror of
https://github.com/safing/portmaster
synced 2025-04-25 05:19:09 +00:00
80664d1a27
* 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>
81 lines
2 KiB
Go
81 lines
2 KiB
Go
package docks
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/safing/portmaster/base/log"
|
|
"github.com/safing/portmaster/service/mgr"
|
|
"github.com/safing/portmaster/spn/terminal"
|
|
"github.com/safing/structures/container"
|
|
)
|
|
|
|
const (
|
|
defaultTerminalIdleTimeout = 15 * time.Minute
|
|
remoteTerminalIdleTimeout = 30 * time.Minute
|
|
)
|
|
|
|
// EstablishNewTerminal establishes a new terminal with the crane.
|
|
func (crane *Crane) EstablishNewTerminal(
|
|
localTerm terminal.Terminal,
|
|
initData *container.Container,
|
|
) *terminal.Error {
|
|
// Create message.
|
|
msg := terminal.NewEmptyMsg()
|
|
msg.FlowID = localTerm.ID()
|
|
msg.Type = terminal.MsgTypeInit
|
|
msg.Data = initData
|
|
|
|
// Register terminal with crane.
|
|
crane.setTerminal(localTerm)
|
|
|
|
// Send message.
|
|
select {
|
|
case crane.controllerMsgs <- msg:
|
|
log.Debugf("spn/docks: %s initiated new terminal %d", crane, localTerm.ID())
|
|
return nil
|
|
case <-crane.ctx.Done():
|
|
crane.AbandonTerminal(localTerm.ID(), terminal.ErrStopping.With("initiation aborted"))
|
|
return terminal.ErrStopping
|
|
}
|
|
}
|
|
|
|
func (crane *Crane) establishTerminal(id uint32, initData *container.Container) {
|
|
// Create new remote crane terminal.
|
|
newTerminal, _, err := NewRemoteCraneTerminal(
|
|
crane,
|
|
id,
|
|
initData,
|
|
)
|
|
if err == nil {
|
|
// Connections via public cranes have a timeout.
|
|
if crane.Public() {
|
|
newTerminal.TerminalBase.SetTimeout(remoteTerminalIdleTimeout)
|
|
}
|
|
// Register terminal with crane.
|
|
crane.setTerminal(newTerminal)
|
|
log.Debugf("spn/docks: %s established new crane terminal %d", crane, newTerminal.ID())
|
|
return
|
|
}
|
|
|
|
// If something goes wrong, send an error back.
|
|
log.Warningf("spn/docks: %s failed to establish crane terminal: %s", crane, err)
|
|
|
|
// Build abandon message.
|
|
msg := terminal.NewMsg(err.Pack())
|
|
msg.FlowID = id
|
|
msg.Type = terminal.MsgTypeStop
|
|
|
|
// Send message directly, or async.
|
|
select {
|
|
case crane.terminalMsgs <- msg:
|
|
default:
|
|
// Send error async.
|
|
module.mgr.Go("abandon terminal", func(ctx *mgr.WorkerCtx) error {
|
|
select {
|
|
case crane.terminalMsgs <- msg:
|
|
case <-ctx.Done():
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
}
|