Release 2.4.7

Author: wh1te909

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20.3'
+          go-version: '1.20.4'
 
       - name: Ensure linux agent compiles
         run: |

agent/agent.go

@@ -40,37 +40,39 @@ import (
 
 // Agent struct
 type Agent struct {
-	Hostname          string
-	Arch              string
-	AgentID           string
-	BaseURL           string
-	ApiURL            string
-	Token             string
-	AgentPK           int
-	Cert              string
-	ProgramDir        string
-	EXE               string
-	SystemDrive       string
-	MeshInstaller     string
-	MeshSystemEXE     string
-	MeshSVC           string
-	PyBin             string
-	Headers           map[string]string
-	Logger            *logrus.Logger
-	Version           string
-	Debug             bool
-	rClient           *resty.Client
-	Proxy             string
-	LogTo             string
-	LogFile           *os.File
-	Platform          string
-	GoArch            string
-	ServiceConfig     *service.Config
-	NatsServer        string
-	NatsProxyPath     string
-	NatsProxyPort     string
-	NatsPingInterval  int
-	NatsWSCompression bool
+	Hostname           string
+	Arch               string
+	AgentID            string
+	BaseURL            string
+	ApiURL             string
+	Token              string
+	AgentPK            int
+	Cert               string
+	ProgramDir         string
+	EXE                string
+	SystemDrive        string
+	WinTmpDir          string
+	WinRunAsUserTmpDir string
+	MeshInstaller      string
+	MeshSystemEXE      string
+	MeshSVC            string
+	PyBin              string
+	Headers            map[string]string
+	Logger             *logrus.Logger
+	Version            string
+	Debug              bool
+	rClient            *resty.Client
+	Proxy              string
+	LogTo              string
+	LogFile            *os.File
+	Platform           string
+	GoArch             string
+	ServiceConfig      *service.Config
+	NatsServer         string
+	NatsProxyPath      string
+	NatsProxyPort      string
+	NatsPingInterval   int
+	NatsWSCompression  bool
 }
 
 const (
@@ -88,7 +90,7 @@ const (
 	defaultMacMeshSvcDir = "/usr/local/mesh_services"
 )
 
-var winTempDir = filepath.Join(os.Getenv("PROGRAMDATA"), "TacticalRMM")
+var defaultWinTmpDir = filepath.Join(os.Getenv("PROGRAMDATA"), "TacticalRMM")
 var winMeshDir = filepath.Join(os.Getenv("PROGRAMFILES"), "Mesh Agent")
 var natsCheckin = []string{"agent-hello", "agent-agentinfo", "agent-disks", "agent-winsvc", "agent-publicip", "agent-wmi"}
 var limitNatsData = []string{"agent-winsvc", "agent-wmi"}
@@ -99,6 +101,8 @@ func New(logger *logrus.Logger, version string) *Agent {
 	pd := filepath.Join(os.Getenv("ProgramFiles"), progFilesName)
 	exe := filepath.Join(pd, winExeName)
 	sd := os.Getenv("SystemDrive")
+	winTempDir := defaultWinTmpDir
+	winRunAsUserTmpDir := defaultWinTmpDir
 
 	var pybin string
 	switch runtime.GOARCH {
@@ -130,6 +134,14 @@ func New(logger *logrus.Logger, version string) *Agent {
 		restyC.SetRootCertificate(ac.Cert)
 	}
 
+	if len(ac.WinTmpDir) > 0 {
+		winTempDir = ac.WinTmpDir
+	}
+
+	if len(ac.WinRunAsUserTmpDir) > 0 {
+		winRunAsUserTmpDir = ac.WinRunAsUserTmpDir
+	}
+
 	var MeshSysExe string
 	switch runtime.GOOS {
 	case "windows":
@@ -189,34 +201,36 @@ func New(logger *logrus.Logger, version string) *Agent {
 	}
 
 	return &Agent{
-		Hostname:          info.Hostname,
-		BaseURL:           ac.BaseURL,
-		AgentID:           ac.AgentID,
-		ApiURL:            ac.APIURL,
-		Token:             ac.Token,
-		AgentPK:           ac.PK,
-		Cert:              ac.Cert,
-		ProgramDir:        pd,
-		EXE:               exe,
-		SystemDrive:       sd,
-		MeshInstaller:     "meshagent.exe",
-		MeshSystemEXE:     MeshSysExe,
-		MeshSVC:           meshSvcName,
-		PyBin:             pybin,
-		Headers:           headers,
-		Logger:            logger,
-		Version:           version,
-		Debug:             logger.IsLevelEnabled(logrus.DebugLevel),
-		rClient:           restyC,
-		Proxy:             ac.Proxy,
-		Platform:          runtime.GOOS,
-		GoArch:            runtime.GOARCH,
-		ServiceConfig:     svcConf,
-		NatsServer:        natsServer,
-		NatsProxyPath:     natsProxyPath,
-		NatsProxyPort:     natsProxyPort,
-		NatsPingInterval:  natsPingInterval,
-		NatsWSCompression: natsWsCompression,
+		Hostname:           info.Hostname,
+		BaseURL:            ac.BaseURL,
+		AgentID:            ac.AgentID,
+		ApiURL:             ac.APIURL,
+		Token:              ac.Token,
+		AgentPK:            ac.PK,
+		Cert:               ac.Cert,
+		ProgramDir:         pd,
+		EXE:                exe,
+		SystemDrive:        sd,
+		WinTmpDir:          winTempDir,
+		WinRunAsUserTmpDir: winRunAsUserTmpDir,
+		MeshInstaller:      "meshagent.exe",
+		MeshSystemEXE:      MeshSysExe,
+		MeshSVC:            meshSvcName,
+		PyBin:              pybin,
+		Headers:            headers,
+		Logger:             logger,
+		Version:            version,
+		Debug:              logger.IsLevelEnabled(logrus.DebugLevel),
+		rClient:            restyC,
+		Proxy:              ac.Proxy,
+		Platform:           runtime.GOOS,
+		GoArch:             runtime.GOARCH,
+		ServiceConfig:      svcConf,
+		NatsServer:         natsServer,
+		NatsProxyPath:      natsProxyPath,
+		NatsProxyPort:      natsProxyPort,
+		NatsPingInterval:   natsPingInterval,
+		NatsWSCompression:  natsWsCompression,
 	}
 }
 
@@ -457,7 +471,7 @@ func (a *Agent) GetUninstallExe() string {
 
 func (a *Agent) CleanupAgentUpdates() {
 	// TODO remove a.ProgramDir, updates are now in winTempDir
-	dirs := [3]string{winTempDir, os.Getenv("TMP"), a.ProgramDir}
+	dirs := [3]string{a.WinTmpDir, os.Getenv("TMP"), a.ProgramDir}
 	for _, dir := range dirs {
 		err := os.Chdir(dir)
 		if err != nil {
@@ -491,7 +505,7 @@ func (a *Agent) CleanupAgentUpdates() {
 
 func (a *Agent) RunPythonCode(code string, timeout int, args []string) (string, error) {
 	content := []byte(code)
-	tmpfn, _ := ioutil.TempFile(winTempDir, "*.py")
+	tmpfn, _ := ioutil.TempFile(a.WinTmpDir, "*.py")
 	if _, err := tmpfn.Write(content); err != nil {
 		a.Logger.Debugln(err)
 		return "", err
@@ -537,8 +551,8 @@ func (a *Agent) RunPythonCode(code string, timeout int, args []string) (string,
 }
 
 func createWinTempDir() error {
-	if !trmm.FileExists(winTempDir) {
-		err := os.Mkdir(winTempDir, 0775)
+	if !trmm.FileExists(defaultWinTmpDir) {
+		err := os.Mkdir(defaultWinTmpDir, 0775)
 		if err != nil {
 			return err
 		}

agent/agent_unix.go

@@ -16,6 +16,7 @@ package agent
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -218,12 +219,12 @@ func (a *Agent) seEnforcing() bool {
 	return out.Status.Exit == 0 && strings.Contains(out.Stdout, "Enforcing")
 }
 
-func (a *Agent) AgentUpdate(url, inno, version string) {
+func (a *Agent) AgentUpdate(url, inno, version string) error {
 
 	self, err := os.Executable()
 	if err != nil {
 		a.Logger.Errorln("AgentUpdate() os.Executable():", err)
-		return
+		return err
 	}
 
 	// more reliable method to get current working directory than os.Getwd()
@@ -233,7 +234,7 @@ func (a *Agent) AgentUpdate(url, inno, version string) {
 	f, err := os.CreateTemp(cwd, "trmm")
 	if err != nil {
 		a.Logger.Errorln("AgentUpdate() os.CreateTemp:", err)
-		return
+		return err
 	}
 	defer os.Remove(f.Name())
 
@@ -252,20 +253,20 @@ func (a *Agent) AgentUpdate(url, inno, version string) {
 	if err != nil {
 		a.Logger.Errorln("AgentUpdate() download:", err)
 		f.Close()
-		return
+		return err
 	}
 	if r.IsError() {
 		a.Logger.Errorln("AgentUpdate() status code:", r.StatusCode())
 		f.Close()
-		return
+		return errors.New("err")
 	}
 
 	f.Close()
 	os.Chmod(f.Name(), 0755)
 	err = os.Rename(f.Name(), self)
 	if err != nil {
 		a.Logger.Errorln("AgentUpdate() os.Rename():", err)
-		return
+		return err
 	}
 
 	if runtime.GOOS == "linux" && a.seEnforcing() {
@@ -283,10 +284,11 @@ func (a *Agent) AgentUpdate(url, inno, version string) {
 	case "darwin":
 		opts.Command = "launchctl kickstart -k system/tacticalagent"
 	default:
-		return
+		return nil
 	}
 
 	a.CmdV2(opts)
+	return nil
 }
 
 func (a *Agent) AgentUninstall(code string) {

agent/agent_windows.go

@@ -62,26 +62,30 @@ func NewAgentConfig() *rmm.AgentConfig {
 	cert, _, _ := k.GetStringValue("Cert")
 	proxy, _, _ := k.GetStringValue("Proxy")
 	customMeshDir, _, _ := k.GetStringValue("MeshDir")
+	winTmpDir, _, _ := k.GetStringValue("WinTmpDir")
+	winRunAsUserTmpDir, _, _ := k.GetStringValue("WinRunAsUserTmpDir")
 	natsProxyPath, _, _ := k.GetStringValue("NatsProxyPath")
 	natsProxyPort, _, _ := k.GetStringValue("NatsProxyPort")
 	natsStandardPort, _, _ := k.GetStringValue("NatsStandardPort")
 	natsPingInterval, _, _ := k.GetStringValue("NatsPingInterval")
 	npi, _ := strconv.Atoi(natsPingInterval)
 
 	return &rmm.AgentConfig{
-		BaseURL:          baseurl,
-		AgentID:          agentid,
-		APIURL:           apiurl,
-		Token:            token,
-		AgentPK:          agentpk,
-		PK:               pk,
-		Cert:             cert,
-		Proxy:            proxy,
-		CustomMeshDir:    customMeshDir,
-		NatsProxyPath:    natsProxyPath,
-		NatsProxyPort:    natsProxyPort,
-		NatsStandardPort: natsStandardPort,
-		NatsPingInterval: npi,
+		BaseURL:            baseurl,
+		AgentID:            agentid,
+		APIURL:             apiurl,
+		Token:              token,
+		AgentPK:            agentpk,
+		PK:                 pk,
+		Cert:               cert,
+		Proxy:              proxy,
+		CustomMeshDir:      customMeshDir,
+		WinTmpDir:          winTmpDir,
+		WinRunAsUserTmpDir: winRunAsUserTmpDir,
+		NatsProxyPath:      natsProxyPath,
+		NatsProxyPort:      natsProxyPort,
+		NatsStandardPort:   natsStandardPort,
+		NatsPingInterval:   npi,
 	}
 }
 
@@ -114,7 +118,13 @@ func (a *Agent) RunScript(code string, shell string, args []string, timeout int,
 		ext = "*.bat"
 	}
 
-	tmpfn, err := ioutil.TempFile(winTempDir, ext)
+	tmpDir := a.WinTmpDir
+
+	if runasuser {
+		tmpDir = a.WinRunAsUserTmpDir
+	}
+
+	tmpfn, err := ioutil.TempFile(tmpDir, ext)
 	if err != nil {
 		a.Logger.Errorln(err)
 		return "", err.Error(), 85, err
@@ -133,7 +143,7 @@ func (a *Agent) RunScript(code string, shell string, args []string, timeout int,
 	switch shell {
 	case "powershell":
 		exe = getPowershellExe()
-		cmdArgs = []string{"-NonInteractive", "-NoProfile", "-ExecutionPolicy", "Bypass", tmpfn.Name()}
+		cmdArgs = []string{"-NonInteractive", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", tmpfn.Name()}
 	case "python":
 		exe = a.PyBin
 		cmdArgs = []string{tmpfn.Name()}
@@ -587,15 +597,16 @@ func (a *Agent) UninstallCleanup() {
 	a.PatchMgmnt(false)
 	a.CleanupAgentUpdates()
 	CleanupSchedTasks()
-	os.RemoveAll(winTempDir)
+	os.RemoveAll(a.WinTmpDir)
+	os.RemoveAll(a.WinRunAsUserTmpDir)
 }
 
-func (a *Agent) AgentUpdate(url, inno, version string) {
+func (a *Agent) AgentUpdate(url, inno, version string) error {
 	time.Sleep(time.Duration(randRange(1, 15)) * time.Second)
 	a.KillHungUpdates()
 	time.Sleep(1 * time.Second)
 	a.CleanupAgentUpdates()
-	updater := filepath.Join(winTempDir, inno)
+	updater := filepath.Join(a.WinTmpDir, inno)
 	a.Logger.Infof("Agent updating from %s to %s", a.Version, version)
 	a.Logger.Debugln("Downloading agent update from", url)
 
@@ -609,16 +620,14 @@ func (a *Agent) AgentUpdate(url, inno, version string) {
 	r, err := rClient.R().SetOutput(updater).Get(url)
 	if err != nil {
 		a.Logger.Errorln(err)
-		CMD("net", []string{"start", winSvcName}, 10, false)
-		return
+		return err
 	}
 	if r.IsError() {
 		a.Logger.Errorln("Download failed with status code", r.StatusCode())
-		CMD("net", []string{"start", winSvcName}, 10, false)
-		return
+		return err
 	}
 
-	innoLogFile := filepath.Join(winTempDir, fmt.Sprintf("tacticalagent_update_v%s.txt", version))
+	innoLogFile := filepath.Join(a.WinTmpDir, fmt.Sprintf("tacticalagent_update_v%s.txt", version))
 
 	args := []string{"/C", updater, "/VERYSILENT", fmt.Sprintf("/LOG=%s", innoLogFile)}
 	cmd := exec.Command("cmd.exe", args...)
@@ -627,6 +636,7 @@ func (a *Agent) AgentUpdate(url, inno, version string) {
 	}
 	cmd.Start()
 	time.Sleep(1 * time.Second)
+	return nil
 }
 
 func (a *Agent) osString() string {