mirror of
https://github.com/safing/portmaster
synced 2025-04-22 20:09:09 +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>
122 lines
2.8 KiB
Go
122 lines
2.8 KiB
Go
package docks
|
|
|
|
import (
|
|
"net"
|
|
|
|
"github.com/safing/portmaster/spn/hub"
|
|
"github.com/safing/portmaster/spn/terminal"
|
|
"github.com/safing/structures/container"
|
|
)
|
|
|
|
// CraneTerminal is a terminal started by a crane.
|
|
type CraneTerminal struct {
|
|
*terminal.TerminalBase
|
|
|
|
// Add-Ons
|
|
terminal.SessionAddOn
|
|
|
|
crane *Crane
|
|
}
|
|
|
|
// NewLocalCraneTerminal returns a new local crane terminal.
|
|
func NewLocalCraneTerminal(
|
|
crane *Crane,
|
|
remoteHub *hub.Hub,
|
|
initMsg *terminal.TerminalOpts,
|
|
) (*CraneTerminal, *container.Container, *terminal.Error) {
|
|
// Create Terminal Base.
|
|
t, initData, err := terminal.NewLocalBaseTerminal(
|
|
crane.ctx,
|
|
crane.getNextTerminalID(),
|
|
crane.ID,
|
|
remoteHub,
|
|
initMsg,
|
|
crane,
|
|
)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
return initCraneTerminal(crane, t), initData, nil
|
|
}
|
|
|
|
// NewRemoteCraneTerminal returns a new remote crane terminal.
|
|
func NewRemoteCraneTerminal(
|
|
crane *Crane,
|
|
id uint32,
|
|
initData *container.Container,
|
|
) (*CraneTerminal, *terminal.TerminalOpts, *terminal.Error) {
|
|
// Create Terminal Base.
|
|
t, initMsg, err := terminal.NewRemoteBaseTerminal(
|
|
crane.ctx,
|
|
id,
|
|
crane.ID,
|
|
crane.identity,
|
|
initData,
|
|
crane,
|
|
)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
return initCraneTerminal(crane, t), initMsg, nil
|
|
}
|
|
|
|
func initCraneTerminal(
|
|
crane *Crane,
|
|
t *terminal.TerminalBase,
|
|
) *CraneTerminal {
|
|
// Create Crane Terminal and assign it as the extended Terminal.
|
|
ct := &CraneTerminal{
|
|
TerminalBase: t,
|
|
crane: crane,
|
|
}
|
|
t.SetTerminalExtension(ct)
|
|
|
|
// Start workers.
|
|
t.StartWorkers(module.mgr, "crane terminal")
|
|
|
|
return ct
|
|
}
|
|
|
|
// GrantPermission grants the given permissions.
|
|
// Additionally, it will mark the crane as authenticated, if not public.
|
|
func (t *CraneTerminal) GrantPermission(grant terminal.Permission) {
|
|
// Forward granted permission to base terminal.
|
|
t.TerminalBase.GrantPermission(grant)
|
|
|
|
// Mark crane as authenticated if not public or already authenticated.
|
|
if !t.crane.Public() && !t.crane.Authenticated() {
|
|
t.crane.authenticated.Set()
|
|
|
|
// Submit metrics.
|
|
newAuthenticatedCranes.Inc()
|
|
}
|
|
}
|
|
|
|
// LocalAddr returns the crane's local address.
|
|
func (t *CraneTerminal) LocalAddr() net.Addr {
|
|
return t.crane.LocalAddr()
|
|
}
|
|
|
|
// RemoteAddr returns the crane's remote address.
|
|
func (t *CraneTerminal) RemoteAddr() net.Addr {
|
|
return t.crane.RemoteAddr()
|
|
}
|
|
|
|
// Transport returns the crane's transport.
|
|
func (t *CraneTerminal) Transport() *hub.Transport {
|
|
return t.crane.Transport()
|
|
}
|
|
|
|
// IsBeingAbandoned returns whether the terminal is being abandoned.
|
|
func (t *CraneTerminal) IsBeingAbandoned() bool {
|
|
return t.Abandoning.IsSet()
|
|
}
|
|
|
|
// HandleDestruction gives the terminal the ability to clean up.
|
|
// The terminal has already fully shut down at this point.
|
|
// Should never be called directly. Call Abandon() instead.
|
|
func (t *CraneTerminal) HandleDestruction(err *terminal.Error) {
|
|
t.crane.AbandonTerminal(t.ID(), err)
|
|
}
|