mirror of
https://github.com/safing/portmaster
synced 2025-09-01 10:09:11 +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>
51 lines
1.1 KiB
Go
51 lines
1.1 KiB
Go
package osdetail
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"os/exec"
|
|
"strings"
|
|
)
|
|
|
|
// RunCmd runs the given command and run error checks on the output.
|
|
func RunCmd(command ...string) (output []byte, err error) {
|
|
// Create command to execute.
|
|
var cmd *exec.Cmd
|
|
switch len(command) {
|
|
case 0:
|
|
return nil, errors.New("no command supplied")
|
|
case 1:
|
|
cmd = exec.Command(command[0])
|
|
default:
|
|
cmd = exec.Command(command[0], command[1:]...)
|
|
}
|
|
|
|
// Create and assign output buffers.
|
|
var stdoutBuf bytes.Buffer
|
|
var stderrBuf bytes.Buffer
|
|
cmd.Stdout = &stdoutBuf
|
|
cmd.Stderr = &stderrBuf
|
|
|
|
// Run command and collect output.
|
|
err = cmd.Run()
|
|
stdout, stderr := stdoutBuf.Bytes(), stderrBuf.Bytes()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// Command might not return an error, but just write to stdout instead.
|
|
if len(stderr) > 0 {
|
|
return nil, errors.New(strings.SplitN(string(stderr), "\n", 2)[0])
|
|
}
|
|
|
|
// Debugging output:
|
|
// fmt.Printf("command stdout: %s\n", stdout)
|
|
// fmt.Printf("command stderr: %s\n", stderr)
|
|
|
|
// Finalize stdout.
|
|
cleanedOutput := bytes.TrimSpace(stdout)
|
|
if len(cleanedOutput) == 0 {
|
|
return nil, ErrEmptyOutput
|
|
}
|
|
|
|
return cleanedOutput, nil
|
|
}
|