Mirrored_Repos/rmmagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from amidaware/revert-11-RefactorDebug

Browse Source 
Revert "Refactor debug"
This commit is contained in:
Dan 2022-06-16 22:15:03 -07:00 committed by GitHub
commit 891b7febcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 20 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -10,5 +10,3 @@
*.bmp *.bmp
build/Output build/Output
tacticalagent-v* tacticalagent-v*
tacticalagent
agent/testargs.json

18
.vscode/launch.json vendored
View File

@ -1,18 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch file",
"type": "go",
"request": "launch",
"mode": "debug",
"env": {},
"args": ["-m", "svc", "-log", "DEBUG", "-logto", "stdout"],
"buildFlags": "-tags=DEBUG",
"program": "${workspaceRoot}"
}
]
}

12
README.md
View File

@ -6,16 +6,4 @@ https://github.com/amidaware/tacticalrmm
env CGO_ENABLED=0 GOOS=<GOOS> GOARCH=<GOARCH> go build -ldflags "-s -w" env CGO_ENABLED=0 GOOS=<GOOS> GOARCH=<GOARCH> go build -ldflags "-s -w"
``` ```
### tests
Navigate to agent directory
```
go test -vet=off
```
Add to settings.json
```
"go.testFlags": [
"-vet=off"
],
"go.testTags": "TEST"
```

12
agent/agent.go
View File

@ -52,7 +52,7 @@ type Agent struct {
EXE string EXE string
SystemDrive string SystemDrive string
MeshInstaller string MeshInstaller string
MeshSystemBin string MeshSystemEXE string
MeshSVC string MeshSVC string
PyBin string PyBin string
Headers map[string]string Headers map[string]string
@ -114,15 +114,15 @@ func New(logger *logrus.Logger, version string) *Agent {
restyC.SetRootCertificate(ac.Cert) restyC.SetRootCertificate(ac.Cert)
} }
var MeshSysBin string var MeshSysExe string
if len(ac.CustomMeshDir) > 0 { if len(ac.CustomMeshDir) > 0 {
MeshSysBin = filepath.Join(ac.CustomMeshDir, "MeshAgent.exe") MeshSysExe = filepath.Join(ac.CustomMeshDir, "MeshAgent.exe")
} else { } else {
MeshSysBin = filepath.Join(os.Getenv("ProgramFiles"), "Mesh Agent", "MeshAgent.exe") MeshSysExe = filepath.Join(os.Getenv("ProgramFiles"), "Mesh Agent", "MeshAgent.exe")
} }
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
MeshSysBin = "/opt/tacticalmesh/meshagent" MeshSysExe = "/opt/tacticalmesh/meshagent"
} }
svcConf := &service.Config{ svcConf := &service.Config{
@ -152,7 +152,7 @@ func New(logger *logrus.Logger, version string) *Agent {
EXE: exe, EXE: exe,
SystemDrive: sd, SystemDrive: sd,
MeshInstaller: "meshagent.exe", MeshInstaller: "meshagent.exe",
MeshSystemBin: MeshSysBin, MeshSystemEXE: MeshSysExe,
MeshSVC: meshSvcName, MeshSVC: meshSvcName,
PyBin: pybin, PyBin: pybin,
Headers: headers, Headers: headers,

7
agent/agent_linux.go
View File

@ -132,7 +132,6 @@ func NewAgentConfig() *rmm.AgentConfig {
viper.SetConfigType("json") viper.SetConfigType("json")
viper.AddConfigPath("/etc/") viper.AddConfigPath("/etc/")
viper.AddConfigPath(".") viper.AddConfigPath(".")
err := viper.ReadInConfig() err := viper.ReadInConfig()
if err != nil { if err != nil {
@ -279,14 +278,14 @@ func (a *Agent) NixMeshNodeID() string {
meshSuccess := false meshSuccess := false
a.Logger.Debugln("Getting mesh node id") a.Logger.Debugln("Getting mesh node id")
if !trmm.FileExists(a.MeshSystemBin) { if !trmm.FileExists(a.MeshSystemEXE) {
a.Logger.Debugln(a.MeshSystemBin, "does not exist. Skipping.") a.Logger.Debugln(a.MeshSystemEXE, "does not exist. Skipping.")
return "" return ""
} }
opts := a.NewCMDOpts() opts := a.NewCMDOpts()
opts.IsExecutable = true opts.IsExecutable = true
opts.Shell = a.MeshSystemBin opts.Shell = a.MeshSystemEXE
opts.Command = "-nodeid" opts.Command = "-nodeid"
for !meshSuccess { for !meshSuccess {

45
agent/agent_linux_test.go
View File

@ -1,45 +0,0 @@
package agent
import (
"bytes"
"io"
"os"
"testing"
)
func captureOutput(f func()) string {
old := os.Stdout
r, w, _ := os.Pipe()
os.Stdout = w
f()
w.Close()
os.Stdout = old
var buf bytes.Buffer
io.Copy(&buf, r)
return buf.String()
}
func TestShowStatus(t *testing.T) {
var (
version = "2.0.4"
)
output := captureOutput(func() {
ShowStatus(version)
})
if output != (version + "\n") {
t.Errorf("ShowStatus output not equal to version defined.")
}
}
func TestOsString(t *testing.T) {
a := New(lg, version)
osString := a.osString()
if osString == "" {
t.Errorf("Could not get OS String")
} else {
t.Logf("Got OS String: %s", osString)
}
}

20
agent/agent_test.go
View File

@ -1,20 +0,0 @@
package agent
import (
"testing"
"github.com/sirupsen/logrus"
)
var (
version = "2.0.4"
lg = logrus.New()
)
func TestAgentId(t *testing.T) {
a := New(lg, version)
if a.AgentID == "" {
t.Error("AgentID not set")
} else {
t.Logf("AgentID: %s", a.AgentID)
}
}

12
agent/agent_windows.go
View File

@ -48,11 +48,6 @@ var (
func NewAgentConfig() *rmm.AgentConfig { func NewAgentConfig() *rmm.AgentConfig {
k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS) k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS)
if shared.TEST {
err = nil
k, _, err := registry.OpenKey(registry.CURRENT_USER, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS)
}
if err != nil { if err != nil {
return &rmm.AgentConfig{} return &rmm.AgentConfig{}
} }
@ -802,7 +797,7 @@ func (a *Agent) RecoverMesh() {
} }
func (a *Agent) getMeshNodeID() (string, error) { func (a *Agent) getMeshNodeID() (string, error) {
out, err := CMD(a.MeshSystemBin, []string{"-nodeid"}, 10, false) out, err := CMD(a.MeshSystemEXE, []string{"-nodeid"}, 10, false)
if err != nil { if err != nil {
a.Logger.Debugln(err) a.Logger.Debugln(err)
return "", err return "", err
@ -840,11 +835,6 @@ func (a *Agent) InstallService() error {
// skip on first call of inno setup if this is a new install // skip on first call of inno setup if this is a new install
_, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS) _, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS)
if shared.TEST {
err = nil
k, _, err := registry.OpenKey(registry.CURRENT_USER, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS)
}
if err != nil { if err != nil {
return nil return nil
} }

15
agent/install.go
View File

@ -23,7 +23,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/amidaware/rmmagent/shared"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
trmm "github.com/wh1te909/trmm-shared" trmm "github.com/wh1te909/trmm-shared"
) )
@ -147,11 +146,11 @@ func (a *Agent) Install(i *Installer) {
arch = "32" arch = "32"
} }
var installerMeshSystemBin string var installerMeshSystemEXE string
if len(i.MeshDir) > 0 { if len(i.MeshDir) > 0 {
installerMeshSystemBin = filepath.Join(i.MeshDir, "MeshAgent.exe") installerMeshSystemEXE = filepath.Join(i.MeshDir, "MeshAgent.exe")
} else { } else {
installerMeshSystemBin = a.MeshSystemBin installerMeshSystemEXE = a.MeshSystemEXE
} }
var meshNodeID string var meshNodeID string
@ -179,7 +178,7 @@ func (a *Agent) Install(i *Installer) {
a.Logger.Debugln("Mesh agent:", mesh) a.Logger.Debugln("Mesh agent:", mesh)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
meshNodeID, err = a.installMesh(mesh, installerMeshSystemBin, i.Proxy) meshNodeID, err = a.installMesh(mesh, installerMeshSystemEXE, i.Proxy)
if err != nil { if err != nil {
a.installerMsg(fmt.Sprintf("Failed to install mesh agent: %s", err.Error()), "error", i.Silent) a.installerMsg(fmt.Sprintf("Failed to install mesh agent: %s", err.Error()), "error", i.Silent)
} }
@ -252,16 +251,10 @@ func (a *Agent) Install(i *Installer) {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
a.Logger.Infoln("Starting service...") a.Logger.Infoln("Starting service...")
out := a.ControlService(winSvcName, "start") out := a.ControlService(winSvcName, "start")
if shared.TEST {
goto SKIPSTART;
}
if !out.Success { if !out.Success {
a.installerMsg(out.ErrorMsg, "error", i.Silent) a.installerMsg(out.ErrorMsg, "error", i.Silent)
} }
SKIPSTART: a.Logger.Infoln("Skipping service start in test.")
a.Logger.Infoln("Adding windows defender exclusions") a.Logger.Infoln("Adding windows defender exclusions")
a.addDefenderExlusions() a.addDefenderExlusions()

14
agent/install_linux.go
View File

@ -13,10 +13,14 @@ package agent
import ( import (
"log" "log"
"github.com/amidaware/rmmagent/shared"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
const (
etcConfig = "/etc/tacticalagent"
)
func (a *Agent) checkExistingAndRemove(silent bool) {} func (a *Agent) checkExistingAndRemove(silent bool) {}
func (a *Agent) installerMsg(msg, alert string, silent bool) { func (a *Agent) installerMsg(msg, alert string, silent bool) {
@ -38,13 +42,7 @@ func createAgentConfig(baseurl, agentid, apiurl, token, agentpk, cert, proxy, me
viper.Set("proxy", proxy) viper.Set("proxy", proxy)
viper.Set("meshdir", meshdir) viper.Set("meshdir", meshdir)
viper.SetConfigPermissions(0660) viper.SetConfigPermissions(0660)
configLocation := "/etc/tacticalagent" err := viper.SafeWriteConfigAs(etcConfig)
if shared.TEST {
configLocation = "tacticalagent"
}
err := viper.SafeWriteConfigAs(configLocation)
if err != nil { if err != nil {
log.Fatalln("createAgentConfig", err) log.Fatalln("createAgentConfig", err)
} }

43
agent/install_test.go
View File

@ -1,43 +0,0 @@
package agent
import (
"testing"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
)
func TestInstall(t *testing.T) {
var (
version = "2.0.4"
log = logrus.New()
)
a := New(log, version)
viper.SetConfigName("testargs.json")
viper.SetConfigType("json")
viper.AddConfigPath(".")
viper.ReadInConfig()
installer := Installer {
RMM: viper.GetString("api"),
ClientID: viper.GetInt("clientid"),
SiteID: viper.GetInt("siteid"),
Description: viper.GetString("description"),
AgentType: viper.GetString("agenttype"),
Power: viper.GetBool("power"),
RDP: viper.GetBool("rdp"),
Ping: viper.GetBool("ping"),
Token: viper.GetString("token"),
LocalMesh: viper.GetString("localmesh"),
Cert: viper.GetString("cert"),
Proxy: viper.GetString("proxy"),
Timeout: viper.GetDuration("timeout"),
Silent: viper.GetBool("silent"),
NoMesh: viper.GetBool("nomesh"),
MeshDir: viper.GetString("meshdir"),
MeshNodeID: viper.GetString("meshnodeid"),
}
a.Install(&installer)
}

11
agent/install_windows.go
View File

@ -17,18 +17,12 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/amidaware/rmmagent/shared"
"github.com/gonutz/w32/v2" "github.com/gonutz/w32/v2"
"golang.org/x/sys/windows/registry" "golang.org/x/sys/windows/registry"
) )
func createAgentConfig(baseurl, agentid, apiurl, token, agentpk, cert, proxy, meshdir string) { func createAgentConfig(baseurl, agentid, apiurl, token, agentpk, cert, proxy, meshdir string) {
k, _, err := registry.CreateKey(registry.LOCAL_MACHINE, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS) k, _, err := registry.CreateKey(registry.LOCAL_MACHINE, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS)
if shared.TEST {
err = nil
k, _, err := registry.OpenKey(registry.CURRENT_USER, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS)
}
if err != nil { if err != nil {
log.Fatalln("Error creating registry key:", err) log.Fatalln("Error creating registry key:", err)
} }
@ -84,11 +78,6 @@ func createAgentConfig(baseurl, agentid, apiurl, token, agentpk, cert, proxy, me
func (a *Agent) checkExistingAndRemove(silent bool) { func (a *Agent) checkExistingAndRemove(silent bool) {
hasReg := false hasReg := false
_, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS) _, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS)
if shared.TEST {
err = nil
_, err = registry.OpenKey(registry.CURRENT_USER, `SOFTWARE\TacticalRMM`, registry.ALL_ACCESS)
}
if err == nil { if err == nil {
hasReg = true hasReg = true
} }

4
agent/rpc.go
View File

@ -49,10 +49,6 @@ var (
) )
func (a *Agent) RunRPC() { func (a *Agent) RunRPC() {
if rmm.DEBUG {
a.Logger.Infoln("DEBUG BUILD STARTED")
}
a.Logger.Infoln("Agent service started") a.Logger.Infoln("Agent service started")
go a.RunAsService() go a.RunAsService()
var wg sync.WaitGroup var wg sync.WaitGroup

10
agent/rpc_test.go
View File

@ -1,10 +0,0 @@
package agent
import (
"testing"
)
func TestRunRPC(t *testing.T) {
a := New(lg, version)
a.RunRPC()
}

19
agent/testargs.json.example
View File

@ -1,19 +0,0 @@
{
"api": "",
"clientid": 1,
"siteid": 1,
"description": "",
"agenttype": "workstation",
"power": false,
"rdp": false,
"ping": false,
"token": "",
"localmesh": "",
"cert": "",
"proxy": "",
"timeout": 30,
"silent": true,
"nomesh": true,
"meshdir": "",
"meshnodeid": ""
}

5
shared/debug.go
View File

@ -1,5 +0,0 @@
//go:build DEBUG
package shared
const DEBUG = true

5
shared/nodebug.go
View File

@ -1,5 +0,0 @@
//go:build !DEBUG
package shared
const DEBUG = false

5
shared/notest.go
View File

@ -1,5 +0,0 @@
//go:build !TEST
package shared
const TEST = false

5
shared/test.go
View File

@ -1,5 +0,0 @@
//go:build TEST
package shared
const TEST = true