vxaboveground/overlord
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove old bs code, start getting ready for freebsd and openbsd support

Browse Source
This commit is contained in:
KingKDot
2026-03-09 00:46:29 -05:00
parent 768b93f02a
commit 38a330f305
8 changed files with 93 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Overlord-Client/cmd/agent/handlers/command.go
-121
View File
@@ -4,10 +4,8 @@ import (
"context"
"encoding/json"
"errors"
"fmt"
"log"
"os"
"os/exec"
goruntime "runtime"
"strconv"
"strings"
@@ -340,107 +338,6 @@ func writeVoiceDownlink(data []byte) error {
return nil
}
func showSupportChatDialog(message, operator string, requireReply bool) (string, error) {
msg := strings.TrimSpace(message)
if msg == "" {
return "", errors.New("missing support message")
}
title := "Remote Support"
if operator = strings.TrimSpace(operator); operator != "" {
title = fmt.Sprintf("Remote Support - %s", operator)
}
switch goruntime.GOOS {
case "windows":
return showSupportChatWindows(msg, title, requireReply)
case "darwin":
return showSupportChatDarwin(msg, title, requireReply)
case "linux":
return showSupportChatLinux(msg, title, requireReply)
default:
return "", fmt.Errorf("support chat is not supported on %s", goruntime.GOOS)
}
}
func showSupportChatWindows(message, title string, requireReply bool) (string, error) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()
var cmd *exec.Cmd
if requireReply {
script := `[void][Reflection.Assembly]::LoadWithPartialName('Microsoft.VisualBasic'); $resp=[Microsoft.VisualBasic.Interaction]::InputBox($env:OVERLORD_SUPPORT_MESSAGE,$env:OVERLORD_SUPPORT_TITLE,''); Write-Output $resp`
cmd = exec.CommandContext(ctx, "powershell", "-NoProfile", "-NonInteractive", "-Command", script)
} else {
script := `Add-Type -AssemblyName PresentationFramework; [void][System.Windows.MessageBox]::Show($env:OVERLORD_SUPPORT_MESSAGE,$env:OVERLORD_SUPPORT_TITLE,[System.Windows.MessageBoxButton]::OK,[System.Windows.MessageBoxImage]::Information)`
cmd = exec.CommandContext(ctx, "powershell", "-NoProfile", "-NonInteractive", "-Command", script)
}
cmd.Env = append(os.Environ(),
"OVERLORD_SUPPORT_MESSAGE="+message,
"OVERLORD_SUPPORT_TITLE="+title,
)
out, err := cmd.CombinedOutput()
if err != nil {
return "", fmt.Errorf("windows support dialog failed: %w", err)
}
if !requireReply {
return "", nil
}
return strings.TrimSpace(string(out)), nil
}
func showSupportChatDarwin(message, title string, requireReply bool) (string, error) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()
esc := func(s string) string {
s = strings.ReplaceAll(s, `\\`, `\\\\`)
s = strings.ReplaceAll(s, `"`, `\\"`)
return s
}
msg := esc(message)
ttl := esc(title)
var script string
if requireReply {
script = fmt.Sprintf(`text returned of (display dialog "%s" with title "%s" default answer "" buttons {"Send"} default button "Send")`, msg, ttl)
} else {
script = fmt.Sprintf(`display dialog "%s" with title "%s" buttons {"OK"} default button "OK"`, msg, ttl)
}
out, err := exec.CommandContext(ctx, "osascript", "-e", script).CombinedOutput()
if err != nil {
return "", fmt.Errorf("macOS support dialog failed: %w", err)
}
if !requireReply {
return "", nil
}
return strings.TrimSpace(string(out)), nil
}
func showSupportChatLinux(message, title string, requireReply bool) (string, error) {
if _, err := exec.LookPath("zenity"); err != nil {
return "", errors.New("zenity is required for support chat on Linux")
}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()
if requireReply {
cmd := exec.CommandContext(ctx, "zenity", "--entry", "--title", title, "--text", message)
out, err := cmd.CombinedOutput()
if err != nil {
return "", fmt.Errorf("linux support input failed: %w", err)
}
return strings.TrimSpace(string(out)), nil
}
cmd := exec.CommandContext(ctx, "zenity", "--info", "--title", title, "--text", message)
if _, err := cmd.CombinedOutput(); err != nil {
return "", fmt.Errorf("linux support message failed: %w", err)
}
return "", nil
}
func HandleCommand(ctx context.Context, env *runtime.Env, envelope map[string]interface{}) error {
cmdID, _ := envelope["id"].(string)
action, _ := envelope["commandType"].(string)
@@ -1588,24 +1485,6 @@ func HandleCommand(ctx context.Context, env *runtime.Env, envelope map[string]in
scriptType = "powershell"
}
return HandleScriptExecute(ctx, env, cmdID, scriptContent, scriptType)
case "support_chat":
payload, _ := envelope["payload"].(map[string]interface{})
message, _ := payload["message"].(string)
operator, _ := payload["operator"].(string)
requireReply := true
if payload != nil {
if v, ok := payload["requireReply"].(bool); ok {
requireReply = v
}
}
reply, err := showSupportChatDialog(message, operator, requireReply)
if err != nil {
return wire.WriteMsg(ctx, env.Conn, wire.CommandResult{Type: "command_result", CommandID: cmdID, OK: false, Message: err.Error()})
}
if requireReply {
return wire.WriteMsg(ctx, env.Conn, wire.CommandResult{Type: "command_result", CommandID: cmdID, OK: true, Message: strings.TrimSpace(reply)})
}
return wire.WriteMsg(ctx, env.Conn, wire.CommandResult{Type: "command_result", CommandID: cmdID, OK: true, Message: "delivered"})
case "silent_exec":
payload, _ := envelope["payload"].(map[string]interface{})
if payload == nil {