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:
49
base/utils/osdetail/shell_windows.go
Normal file
49
base/utils/osdetail/shell_windows.go
Normal file
@@ -0,0 +1,49 @@
|
||||
package osdetail
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
)
|
||||
|
||||
// RunPowershellCmd runs a powershell command and returns its output.
|
||||
func RunPowershellCmd(script string) (output []byte, err error) {
|
||||
// Create command to execute.
|
||||
return RunCmd(
|
||||
"powershell.exe",
|
||||
"-ExecutionPolicy", "Bypass",
|
||||
"-NoProfile",
|
||||
"-NonInteractive",
|
||||
"[System.Console]::OutputEncoding = [System.Text.Encoding]::UTF8\n"+script,
|
||||
)
|
||||
}
|
||||
|
||||
const outputSeparator = "pwzzhtuvpwdgozhzbnjj"
|
||||
|
||||
// RunTerminalCmd runs a Windows cmd command and returns its output.
|
||||
// It sets the output of the cmd to UTF-8 in order to avoid encoding errors.
|
||||
func RunTerminalCmd(command ...string) (output []byte, err error) {
|
||||
output, err = RunCmd(append([]string{
|
||||
"cmd.exe",
|
||||
"/c",
|
||||
"chcp", // Set output encoding...
|
||||
"65001", // ...to UTF-8.
|
||||
"&",
|
||||
"echo",
|
||||
outputSeparator,
|
||||
"&",
|
||||
},
|
||||
command...,
|
||||
)...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Find correct start of output and shift start.
|
||||
index := bytes.IndexAny(output, outputSeparator+"\r\n")
|
||||
if index < 0 {
|
||||
return nil, errors.New("failed to post-process output: could not find output separator")
|
||||
}
|
||||
output = output[index+len(outputSeparator)+2:]
|
||||
|
||||
return output, nil
|
||||
}
|
||||
Reference in New Issue
Block a user