Restructure modules (#1572)
* 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:
105
base/utils/atomic.go
Normal file
105
base/utils/atomic.go
Normal file
@@ -0,0 +1,105 @@
|
||||
package utils
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"os"
|
||||
|
||||
"github.com/safing/portmaster/base/utils/renameio"
|
||||
)
|
||||
|
||||
// AtomicFileOptions holds additional options for manipulating
|
||||
// the behavior of CreateAtomic and friends.
|
||||
type AtomicFileOptions struct {
|
||||
// Mode is the file mode for the new file. If
|
||||
// 0, the file mode will be set to 0600.
|
||||
Mode os.FileMode
|
||||
|
||||
// TempDir is the path to the temp-directory
|
||||
// that should be used. If empty, it defaults
|
||||
// to the system temp.
|
||||
TempDir string
|
||||
}
|
||||
|
||||
// CreateAtomic creates or overwrites a file at dest atomically using
|
||||
// data from r. Atomic means that even in case of a power outage,
|
||||
// dest will never be a zero-length file. It will always either contain
|
||||
// the previous data (or not exist) or the new data but never anything
|
||||
// in between.
|
||||
func CreateAtomic(dest string, r io.Reader, opts *AtomicFileOptions) error {
|
||||
if opts == nil {
|
||||
opts = &AtomicFileOptions{}
|
||||
}
|
||||
|
||||
tmpFile, err := renameio.TempFile(opts.TempDir, dest)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create temp file: %w", err)
|
||||
}
|
||||
defer tmpFile.Cleanup() //nolint:errcheck
|
||||
|
||||
if opts.Mode != 0 {
|
||||
if err := tmpFile.Chmod(opts.Mode); err != nil {
|
||||
return fmt.Errorf("failed to update mode bits of temp file: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if _, err := io.Copy(tmpFile, r); err != nil {
|
||||
return fmt.Errorf("failed to copy source file: %w", err)
|
||||
}
|
||||
|
||||
if err := tmpFile.CloseAtomicallyReplace(); err != nil {
|
||||
return fmt.Errorf("failed to rename temp file to %q", dest)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// CopyFileAtomic is like CreateAtomic but copies content from
|
||||
// src to dest. If opts.Mode is 0 CopyFileAtomic tries to set
|
||||
// the file mode of src to dest.
|
||||
func CopyFileAtomic(dest string, src string, opts *AtomicFileOptions) error {
|
||||
if opts == nil {
|
||||
opts = &AtomicFileOptions{}
|
||||
}
|
||||
|
||||
if opts.Mode == 0 {
|
||||
stat, err := os.Stat(src)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
opts.Mode = stat.Mode()
|
||||
}
|
||||
|
||||
f, err := os.Open(src)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
_ = f.Close()
|
||||
}()
|
||||
|
||||
return CreateAtomic(dest, f, opts)
|
||||
}
|
||||
|
||||
// ReplaceFileAtomic replaces the file at dest with the content from src.
|
||||
// If dest exists it's file mode copied and used for the replacement. If
|
||||
// not, dest will get the same file mode as src. See CopyFileAtomic and
|
||||
// CreateAtomic for more information.
|
||||
func ReplaceFileAtomic(dest string, src string, opts *AtomicFileOptions) error {
|
||||
if opts == nil {
|
||||
opts = &AtomicFileOptions{}
|
||||
}
|
||||
|
||||
if opts.Mode == 0 {
|
||||
stat, err := os.Stat(dest)
|
||||
if err == nil {
|
||||
opts.Mode = stat.Mode()
|
||||
} else if !errors.Is(err, fs.ErrNotExist) {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return CopyFileAtomic(dest, src, opts)
|
||||
}
|
||||
Reference in New Issue
Block a user