gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-25 16:44:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #484 from gravitl/develop

Browse source 
Develop
This commit is contained in:
Alex 2021-11-18 00:07:10 -05:00 committed by GitHub
commit 221aa8098e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 232 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
database/postgres.go
View file

@ -4,6 +4,7 @@ import (
"database/sql"
"errors"
"fmt"
"github.com/gravitl/netmaker/servercfg"
_ "github.com/lib/pq"
)

40
netclient/ncutils/netclientutils.go
View file

@ -190,42 +190,6 @@ PersistentKeepAlive = %s
return peersString, nil
}
// CreateUserSpaceConf - creates a user space WireGuard conf
func CreateUserSpaceConf(address string, privatekey string, listenPort string, mtu int32, fwmark int32, perskeepalive int32, peers []wgtypes.PeerConfig) (string, error) {
peersString, err := parsePeers(perskeepalive, peers)
var listenPortString string
var fwmarkString string
if mtu <= 0 {
mtu = 1280
}
if listenPort != "" {
listenPortString += "ListenPort = " + listenPort
}
if fwmark != 0 {
fwmarkString += "FWMark = " + strconv.Itoa(int(fwmark))
}
if err != nil {
return "", err
}
config := fmt.Sprintf(`[Interface]
Address = %s
PrivateKey = %s
MTU = %s
%s
%s
%s
`,
address+"/32",
privatekey,
strconv.Itoa(int(mtu)),
listenPortString,
fwmarkString,
peersString)
return config, nil
}
// GetLocalIP - gets local ip of machine
func GetLocalIP(localrange string) (string, error) {
_, localRange, err := net.ParseCIDR(localrange)
@ -279,7 +243,9 @@ func GetNetworkIPMask(networkstring string) (string, string, error) {
return "", "", err
}
ipstring := ip.String()
maskstring := ipnet.Mask.String()
mask := ipnet.Mask
maskstring := fmt.Sprintf("%d.%d.%d.%d", mask[0], mask[1], mask[2], mask[3])
//maskstring := ipnet.Mask.String()
return ipstring, maskstring, err
}

43
netclient/ncutils/netclientutils_darwin.go
View file

@ -1,9 +1,13 @@
package ncutils
import (
"fmt"
"log"
"os/exec"
"strconv"
"strings"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
// RunCmd - runs a local command
@ -19,3 +23,42 @@ func RunCmd(command string, printerr bool) (string, error) {
return string(out), err
}
func RunCmdFormatted(command string, printerr bool) (string, error) {
return "", nil
}
// CreateUserSpaceConf - creates a user space WireGuard conf
func CreateUserSpaceConf(address string, privatekey string, listenPort string, mtu int32, fwmark int32, perskeepalive int32, peers []wgtypes.PeerConfig) (string, error) {
peersString, err := parsePeers(perskeepalive, peers)
var listenPortString string
var fwmarkString string
if mtu <= 0 {
mtu = 1280
}
if listenPort != "" {
listenPortString += "ListenPort = " + listenPort
}
if fwmark != 0 {
fwmarkString += "FWMark = " + strconv.Itoa(int(fwmark))
}
if err != nil {
return "", err
}
config := fmt.Sprintf(`[Interface]
Address = %s
PrivateKey = %s
MTU = %s
%s
%s
%s
`,
address+"/32",
privatekey,
strconv.Itoa(int(mtu)),
listenPortString,
fwmarkString,
peersString)
return config, nil
}

43
netclient/ncutils/netclientutils_freebsd.go
View file

@ -2,13 +2,20 @@ package ncutils
import (
"context"
"fmt"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"log"
"os/exec"
"strconv"
"strings"
"syscall"
"time"
)
func RunCmdFormatted(command string, printerr bool) (string, error) {
return "", nil
}
// Runs Commands for FreeBSD
func RunCmd(command string, printerr bool) (string, error) {
args := strings.Fields(command)
@ -27,3 +34,39 @@ func RunCmd(command string, printerr bool) (string, error) {
}
return string(out), err
}
// CreateUserSpaceConf - creates a user space WireGuard conf
func CreateUserSpaceConf(address string, privatekey string, listenPort string, mtu int32, fwmark int32, perskeepalive int32, peers []wgtypes.PeerConfig) (string, error) {
peersString, err := parsePeers(perskeepalive, peers)
var listenPortString string
var fwmarkString string
if mtu <= 0 {
mtu = 1280
}
if listenPort != "" {
listenPortString += "ListenPort = " + listenPort
}
if fwmark != 0 {
fwmarkString += "FWMark = " + strconv.Itoa(int(fwmark))
}
if err != nil {
return "", err
}
config := fmt.Sprintf(`[Interface]
Address = %s
PrivateKey = %s
MTU = %s
%s
%s
%s
`,
address+"/32",
privatekey,
strconv.Itoa(int(mtu)),
listenPortString,
fwmarkString,
peersString)
return config, nil
}

44
netclient/ncutils/netclientutils_linux.go
View file

@ -1,9 +1,13 @@
package ncutils
import (
"fmt"
"log"
"os/exec"
"strconv"
"strings"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
// RunCmd - runs a local command
@ -18,3 +22,43 @@ func RunCmd(command string, printerr bool) (string, error) {
}
return string(out), err
}
func RunCmdFormatted(command string, printerr bool) (string, error) {
return "", nil
}
// CreateUserSpaceConf - creates a user space WireGuard conf
func CreateUserSpaceConf(address string, privatekey string, listenPort string, mtu int32, fwmark int32, perskeepalive int32, peers []wgtypes.PeerConfig) (string, error) {
peersString, err := parsePeers(perskeepalive, peers)
var listenPortString string
var fwmarkString string
if mtu <= 0 {
mtu = 1280
}
if listenPort != "" {
listenPortString += "ListenPort = " + listenPort
}
if fwmark != 0 {
fwmarkString += "FWMark = " + strconv.Itoa(int(fwmark))
}
if err != nil {
return "", err
}
config := fmt.Sprintf(`[Interface]
Address = %s
PrivateKey = %s
MTU = %s
%s
%s
%s
`,
address+"/32",
privatekey,
strconv.Itoa(int(mtu)),
listenPortString,
fwmarkString,
peersString)
return config, nil
}

54
netclient/ncutils/netclientutils_windows.go
View file

@ -1,9 +1,15 @@
package ncutils
import (
"fmt"
"log"
"os"
"os/exec"
"strconv"
"strings"
"syscall"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
// RunCmd - runs a local command
@ -11,6 +17,24 @@ func RunCmd(command string, printerr bool) (string, error) {
args := strings.Fields(command)
cmd := exec.Command(args[0], args[1:]...)
cmd.Wait()
//cmd.SysProcAttr = &syscall.SysProcAttr{CmdLine: "/C \"" + command + "\""}
out, err := cmd.CombinedOutput()
if err != nil && printerr {
log.Println("error running command:", command)
log.Println(strings.TrimSuffix(string(out), "\n"))
}
return string(out), err
}
// RunCmd - runs a local command
func RunCmdFormatted(command string, printerr bool) (string, error) {
var comSpec = os.Getenv("COMSPEC")
if comSpec == "" {
comSpec = os.Getenv("SystemRoot") + "\\System32\\cmd.exe"
}
cmd := exec.Command(comSpec)
cmd.SysProcAttr = &syscall.SysProcAttr{CmdLine: "/C \"" + command + "\""}
cmd.Wait()
out, err := cmd.CombinedOutput()
if err != nil && printerr {
log.Println("error running command:", command)
@ -18,3 +42,33 @@ func RunCmd(command string, printerr bool) (string, error) {
}
return string(out), err
}
// CreateUserSpaceConf - creates a user space WireGuard conf
func CreateUserSpaceConf(address string, privatekey string, listenPort string, mtu int32, fwmark int32, perskeepalive int32, peers []wgtypes.PeerConfig) (string, error) {
peersString, err := parsePeers(perskeepalive, peers)
var listenPortString string
if mtu <= 0 {
mtu = 1280
}
if listenPort != "" {
listenPortString += "ListenPort = " + listenPort
}
if err != nil {
return "", err
}
config := fmt.Sprintf(`[Interface]
Address = %s
PrivateKey = %s
MTU = %s
%s
%s
`,
address+"/32",
privatekey,
strconv.Itoa(int(mtu)),
listenPortString,
peersString)
return config, nil
}

31
netclient/wireguard/common.go
View file

@ -1,6 +1,7 @@
package wireguard
import (
"errors"
"fmt"
"io/ioutil"
"log"
@ -188,10 +189,9 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
}
if ncutils.IsWindows() {
wgConfPath := ncutils.GetWGPathSpecific() + ifacename + ".conf"
ncutils.PrintLog("error writing wg conf file to "+confPath+": "+err.Error(), 1)
err = ioutil.WriteFile(wgConfPath, []byte(newConf), 0644)
if err != nil {
ncutils.PrintLog("error writing wg conf file to "+confPath+": "+err.Error(), 1)
ncutils.PrintLog("error writing wg conf file to "+wgConfPath+": "+err.Error(), 1)
return err
}
confPath = wgConfPath
@ -218,6 +218,25 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
ncutils.PrintLog("failed to create wireguard interface", 1)
return err
}
if ncutils.IsWindows() {
var output string
starttime := time.Now()
ncutils.PrintLog("waiting for interface...", 1)
for !strings.Contains(output, ifacename) && !(time.Now().After(starttime.Add(time.Duration(10) * time.Second))) {
output, _ = ncutils.RunCmd("wg", false)
time.Sleep(time.Second >> 1)
err = ApplyConf(confPath)
}
if !strings.Contains(output, ifacename) {
return errors.New("could not create wg interface for " + ifacename)
}
ip, mask, err := ncutils.GetNetworkIPMask(nodecfg.NetworkSettings.AddressRange)
if err != nil {
log.Println(err.Error())
return err
}
_, _ = ncutils.RunCmd("route add "+ip+" mask "+mask+" "+node.Address, true)
}
}
} else {
ipExec, err := exec.LookPath("ip")
@ -281,13 +300,7 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
}
//extra network route setting required for freebsd and windows
if ncutils.IsWindows() {
ip, mask, err := ncutils.GetNetworkIPMask(nodecfg.NetworkSettings.AddressRange)
if err != nil {
return err
}
_, _ = ncutils.RunCmd("route add "+ip+" mask "+mask+" "+node.Address, true)
} else if ncutils.IsFreeBSD() {
if ncutils.IsFreeBSD() {
_, _ = ncutils.RunCmd("route add -net "+nodecfg.NetworkSettings.AddressRange+" -interface "+ifacename, true)
}

9
netclient/wireguard/windows.go
View file

@ -1,9 +1,14 @@
package wireguard
import "github.com/gravitl/netmaker/netclient/ncutils"
import (
"fmt"
"github.com/gravitl/netmaker/netclient/ncutils"
)
func ApplyWindowsConf(confPath string) error {
if _, err := ncutils.RunCmd("wireguard.exe /installtunnelservice "+confPath, false); err != nil {
var commandLine = fmt.Sprintf(`wireguard.exe /installtunnelservice "%s"`, confPath)
if _, err := ncutils.RunCmdFormatted(commandLine, false); err != nil {
return err
}
return nil

17
scripts/netclient-install.ps1
View file

@ -1,4 +1,6 @@
new-module -name netclient-install -scriptblock {
$ErrorActionPreference = "Stop"
function Quit {
param(
$Text
@ -23,8 +25,7 @@ new-module -name netclient-install -scriptblock {
$outpath = "$env:userprofile\Downloads\wireguard-installer.exe"
Invoke-WebRequest -Uri $url -OutFile $outpath
$args = @("Comma","Separated","Arguments")
Start-Process -Filepath "$env:userprofile\Downloads\wireguard-installer.exe" -ArgumentList $args
Start-Sleep -Seconds 5
Start-Process -Filepath "$env:userprofile\Downloads\wireguard-installer.exe" -ArgumentList $args -Wait
$software = "WireGuard";
$installed = (Get-ItemProperty HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\* | Where { $_.DisplayName -eq $software }) -ne $null
If(-Not $installed) {
@ -44,9 +45,11 @@ new-module -name netclient-install -scriptblock {
Write-Host "https://github.com/gravitl/netmaker/releases/download/$version/netclient.exe";
$url = "https://github.com/gravitl/netmaker/releases/download/$version/netclient.exe"
Invoke-WebRequest -Uri $url -OutFile $outpath
$loc = Get-Location
Copy-Item -Path "$env:userprofile\Downloads\netclient.exe" -Destination "$loc\netclient.exe"
}
$NetArgs = @("join","-t",$token)
Start-Process -Filepath $outpath -ArgumentList $NetArgs
Start-Process -Filepath $outpath -ArgumentList $NetArgs -Wait
Add-MpPreference -ExclusionPath "C:\ProgramData\Netclient"
if ((Get-Command "netclient.exe" -ErrorAction SilentlyContinue) -eq $null) {
@ -58,15 +61,7 @@ new-module -name netclient-install -scriptblock {
Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value $newPath
$env:Path += ";C:\ProgramData\Netclient\bin"
}
'''
Please add netclient.exe to your path to make it permanently executable from powershell:
1. Open "Edit environment variables for your account"
2. Double click on "Path"
3. On a new line, add the following: C:\ProgramData\Netclient\bin
4. Click "Ok"
'''
}
Write-Host "'netclient' is installed."
}
}