From 13b5474cd829ebd8a54b0ea8873115490c3e37d2 Mon Sep 17 00:00:00 2001 From: redanthrax Date: Wed, 15 Jun 2022 20:12:48 -0700 Subject: [PATCH] updates for testing in windows --- agent/agent_windows.go | 10 ++++++++++ agent/install_linux.go | 4 +--- agent/install_windows.go | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/agent/agent_windows.go b/agent/agent_windows.go index 9df3eb5..2d6d1e1 100644 --- a/agent/agent_windows.go +++ b/agent/agent_windows.go @@ -48,6 +48,11 @@ var ( func NewAgentConfig() *rmm.AgentConfig { 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 { return &rmm.AgentConfig{} } @@ -835,6 +840,11 @@ func (a *Agent) InstallService() error { // skip on first call of inno setup if this is a new install _, 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 { return nil } diff --git a/agent/install_linux.go b/agent/install_linux.go index 915b111..7391609 100644 --- a/agent/install_linux.go +++ b/agent/install_linux.go @@ -13,9 +13,7 @@ package agent import ( "log" - "os" - "strings" - + "github.com/amidaware/rmmagent/shared" "github.com/spf13/viper" ) diff --git a/agent/install_windows.go b/agent/install_windows.go index f145757..db6467b 100644 --- a/agent/install_windows.go +++ b/agent/install_windows.go @@ -24,6 +24,10 @@ import ( func createAgentConfig(baseurl, agentid, apiurl, token, agentpk, cert, proxy, meshdir string) { 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 { log.Fatalln("Error creating registry key:", err)