zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 01:07:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

reverting windows behavior

Browse Source
This commit is contained in:
afeiszli
2022-02-15 20:51:00 -05:00
parent 69b1ce1198
commit 0fa480ab9a
4 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netclient/command/commands.go
View File

@@ -48,11 +48,13 @@ func Join(cfg config.ClientConfig, privateKey string) error {
return err return err
} }
ncutils.PrintLog("joined "+cfg.Network, 1) ncutils.PrintLog("joined "+cfg.Network, 1)
if ncutils.IsWindows() { /*
ncutils.PrintLog("setting up WireGuard app", 0) if ncutils.IsWindows() {
time.Sleep(time.Second >> 1) ncutils.PrintLog("setting up WireGuard app", 0)
functions.Pull(cfg.Network, true) time.Sleep(time.Second >> 1)
} functions.Pull(cfg.Network, true)
}
*/
return err return err
} }

2
netclient/ncutils/netclientutils.go
View File

@@ -49,7 +49,7 @@ const LINUX_APP_DATA_PATH = "/etc/netclient"
const WINDOWS_APP_DATA_PATH = "C:\\ProgramData\\Netclient" const WINDOWS_APP_DATA_PATH = "C:\\ProgramData\\Netclient"
// WINDOWS_APP_DATA_PATH - windows path // WINDOWS_APP_DATA_PATH - windows path
const WINDOWS_WG_DPAPI_PATH = "C:\\Program Files\\WireGuard\\Data\\Configurations" //const WINDOWS_WG_DPAPI_PATH = "C:\\Program Files\\WireGuard\\Data\\Configurations"
// WINDOWS_SVC_NAME - service name // WINDOWS_SVC_NAME - service name
const WINDOWS_SVC_NAME = "netclient" const WINDOWS_SVC_NAME = "netclient"

BIN
netclient/netclient.syso Normal file
View File

Binary file not shown.

47
netclient/wireguard/windows.go
View File

@@ -2,23 +2,22 @@ package wireguard
import ( import (
"fmt" "fmt"
"os"
"strings"
"time"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
) )
// ApplyWindowsConf - applies the WireGuard configuration file on Windows // ApplyWindowsConf - applies the WireGuard configuration file on Windows
func ApplyWindowsConf(confPath string) error { func ApplyWindowsConf(confPath string) error {
pathStrings := strings.Split(confPath, ncutils.GetWGPathSpecific()) /*
if len(pathStrings) == 2 { pathStrings := strings.Split(confPath, ncutils.GetWGPathSpecific())
copyConfPath := fmt.Sprintf("%s\\%s", ncutils.WINDOWS_WG_DPAPI_PATH, pathStrings[1]) if len(pathStrings) == 2 {
err := ncutils.Copy(confPath, copyConfPath) copyConfPath := fmt.Sprintf("%s\\%s", ncutils.WINDOWS_WG_DPAPI_PATH, pathStrings[1])
if err != nil { err := ncutils.Copy(confPath, copyConfPath)
ncutils.PrintLog(err.Error(), 1) if err != nil {
ncutils.PrintLog(err.Error(), 1)
}
} }
} */
var commandLine = fmt.Sprintf(`wireguard.exe /installtunnelservice "%s"`, confPath) var commandLine = fmt.Sprintf(`wireguard.exe /installtunnelservice "%s"`, confPath)
if _, err := ncutils.RunCmdFormatted(commandLine, false); err != nil { if _, err := ncutils.RunCmdFormatted(commandLine, false); err != nil {
return err return err
@@ -31,20 +30,22 @@ func RemoveWindowsConf(ifacename string, printlog bool) error {
if _, err := ncutils.RunCmd("wireguard.exe /uninstalltunnelservice "+ifacename, printlog); err != nil { if _, err := ncutils.RunCmd("wireguard.exe /uninstalltunnelservice "+ifacename, printlog); err != nil {
ncutils.PrintLog(err.Error(), 1) ncutils.PrintLog(err.Error(), 1)
} }
dpapipath := fmt.Sprintf("%s\\%s.conf.dpapi", ncutils.WINDOWS_WG_DPAPI_PATH, ifacename) /*
confpath := fmt.Sprintf("%s\\%s.conf", ncutils.WINDOWS_WG_DPAPI_PATH, ifacename) dpapipath := fmt.Sprintf("%s\\%s.conf.dpapi", ncutils.WINDOWS_WG_DPAPI_PATH, ifacename)
if ncutils.FileExists(confpath) { confpath := fmt.Sprintf("%s\\%s.conf", ncutils.WINDOWS_WG_DPAPI_PATH, ifacename)
err := os.Remove(confpath) if ncutils.FileExists(confpath) {
if err != nil { err := os.Remove(confpath)
ncutils.PrintLog(err.Error(), 1) if err != nil {
ncutils.PrintLog(err.Error(), 1)
}
} }
} time.Sleep(time.Second >> 2)
time.Sleep(time.Second >> 2) if ncutils.FileExists(dpapipath) {
if ncutils.FileExists(dpapipath) { err := os.Remove(dpapipath)
err := os.Remove(dpapipath) if err != nil {
if err != nil { ncutils.PrintLog(err.Error(), 1)
ncutils.PrintLog(err.Error(), 1) }
} }
} */
return nil return nil
} }