mirror of
https://github.com/fankes/komari-agent.git
synced 2025-12-11 16:03:39 +08:00
feat: 添加任务执行功能
fix: 版本解析逻辑
This commit is contained in:
81
server/task.go
Normal file
81
server/task.go
Normal file
@@ -0,0 +1,81 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"log"
|
||||
"net/http"
|
||||
"os/exec"
|
||||
"runtime"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/komari-monitor/komari-agent/cmd/flags"
|
||||
)
|
||||
|
||||
func NewTask(task_id, command string) {
|
||||
if task_id == "" {
|
||||
return
|
||||
}
|
||||
if command == "" {
|
||||
uploadTaskResult(task_id, "No command provided", 0, time.Now())
|
||||
return
|
||||
}
|
||||
if flags.DisableWebSsh {
|
||||
uploadTaskResult(task_id, "Web SSH (REC) is disabled.", -1, time.Now())
|
||||
return
|
||||
}
|
||||
log.Printf("Executing task %s with command: %s", task_id, command)
|
||||
var cmd *exec.Cmd
|
||||
if runtime.GOOS == "windows" {
|
||||
cmd = exec.Command("powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; "+command)
|
||||
} else {
|
||||
cmd = exec.Command("sh", "-c", command)
|
||||
}
|
||||
var stdout, stderr bytes.Buffer
|
||||
cmd.Stdout = &stdout
|
||||
cmd.Stderr = &stderr
|
||||
|
||||
err := cmd.Run()
|
||||
finishedAt := time.Now()
|
||||
|
||||
result := stdout.String()
|
||||
if stderr.Len() > 0 {
|
||||
result += "\n" + stderr.String()
|
||||
}
|
||||
result = strings.ReplaceAll(result, "\r\n", "\n")
|
||||
exitCode := 0
|
||||
if err != nil {
|
||||
if exitError, ok := err.(*exec.ExitError); ok {
|
||||
exitCode = exitError.ExitCode()
|
||||
}
|
||||
}
|
||||
|
||||
uploadTaskResult(task_id, result, exitCode, finishedAt)
|
||||
}
|
||||
|
||||
func uploadTaskResult(taskID, result string, exitCode int, finishedAt time.Time) {
|
||||
payload := map[string]interface{}{
|
||||
"task_id": taskID,
|
||||
"result": result,
|
||||
"exit_code": exitCode,
|
||||
"finished_at": finishedAt,
|
||||
}
|
||||
|
||||
jsonData, _ := json.Marshal(payload)
|
||||
endpoint := flags.Endpoint + "/api/clients/task/result?token=" + flags.Token
|
||||
|
||||
resp, _ := http.Post(endpoint, "application/json", bytes.NewBuffer(jsonData))
|
||||
maxRetry := flags.MaxRetries
|
||||
for i := 0; i < maxRetry && resp.StatusCode != http.StatusOK; i++ {
|
||||
log.Printf("Failed to upload task result, retrying %d/%d", i+1, maxRetry)
|
||||
time.Sleep(2 * time.Second) // Wait before retrying
|
||||
resp, _ = http.Post(endpoint, "application/json", bytes.NewBuffer(jsonData))
|
||||
}
|
||||
if resp != nil {
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
log.Printf("Failed to upload task result: %s", resp.Status)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -99,7 +99,11 @@ func handleWebSocketMessages(conn *websocket.Conn, done chan<- struct{}) {
|
||||
}
|
||||
var message struct {
|
||||
Message string `json:"message"`
|
||||
ID string `json:"request_id"`
|
||||
// Terminal
|
||||
TerminalId string `json:"request_id,omitempty"`
|
||||
// Remote Exec
|
||||
ExecCommand string `json:"command,omitempty"`
|
||||
ExecTaskID string `json:"task_id,omitempty"`
|
||||
}
|
||||
err = json.Unmarshal(message_raw, &message)
|
||||
if err != nil {
|
||||
@@ -107,8 +111,12 @@ func handleWebSocketMessages(conn *websocket.Conn, done chan<- struct{}) {
|
||||
continue
|
||||
}
|
||||
|
||||
if message.Message == "terminal" || message.ID != "" {
|
||||
go establishTerminalConnection(flags.Token, message.ID, flags.Endpoint)
|
||||
if message.Message == "terminal" || message.TerminalId != "" {
|
||||
go establishTerminalConnection(flags.Token, message.TerminalId, flags.Endpoint)
|
||||
continue
|
||||
}
|
||||
if message.Message == "exec" {
|
||||
go NewTask(message.ExecTaskID, message.ExecCommand)
|
||||
continue
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user