gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 07:46:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed udp ports?

Browse source
This commit is contained in:
worker-9 2021-08-05 22:35:23 -04:00
parent 27de1580e9
commit 01e9d1efb4
3 changed files with 51 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
netclient/functions/checkin.go
View file

@ -203,13 +203,13 @@ func Pull(network string, manual bool) (*models.Node, error) {
log.Println("could not delete old interface", cfg.Node.Interface)
}
}
resNode.PullChanges = "no"
if err = config.ModConfig(&resNode); err != nil {
return nil, err
}
if err = wireguard.SetWGConfig(network, false); err != nil {
return nil, err
}
resNode.PullChanges = "no"
nodeData, err := json.Marshal(&resNode)
if err != nil {
return &resNode, err

98
netclient/functions/register.go
View file

@ -1,95 +1,95 @@
package functions
import (
"time"
"os"
"net"
"log"
"io/ioutil"
"bytes"
"github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/local"
"github.com/gravitl/netmaker/netclient/wireguard"
"github.com/gravitl/netmaker/models"
"encoding/json"
"net/http"
"errors"
// "github.com/davecgh/go-spew/spew"
"io/ioutil"
"log"
"net"
"net/http"
"os"
"time"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/local"
// "github.com/davecgh/go-spew/spew"
)
func Register(cfg config.GlobalConfig) error {
_, err := os.Stat("/etc/netclient")
if os.IsNotExist(err) {
os.Mkdir("/etc/netclient", 744)
} else if err != nil {
log.Println("couldnt find or create /etc/netclient")
return err
}
if os.IsNotExist(err) {
os.Mkdir("/etc/netclient", 744)
} else if err != nil {
log.Println("couldnt find or create /etc/netclient")
return err
}
postclient := &models.IntClient{
AccessKey: cfg.Client.AccessKey,
PublicKey: cfg.Client.PublicKey,
PrivateKey: cfg.Client.PublicKey,
Address: cfg.Client.Address,
Address6: cfg.Client.Address6,
Network: "comms",
postclient := &models.IntClient{
AccessKey: cfg.Client.AccessKey,
PublicKey: cfg.Client.PublicKey,
PrivateKey: cfg.Client.PublicKey,
Address: cfg.Client.Address,
Address6: cfg.Client.Address6,
Network: "comms",
}
jsonstring, err := json.Marshal(postclient)
if err != nil {
return err
}
if err != nil {
return err
}
jsonbytes := []byte(jsonstring)
body := bytes.NewBuffer(jsonbytes)
publicaddress := net.JoinHostPort(cfg.Client.ServerPublicEndpoint, cfg.Client.ServerAPIPort)
res, err := http.Post("http://"+publicaddress+"/api/intclient/register","application/json",body)
if err != nil {
log.Println("Failed to register to http://"+publicaddress+"/api/client/register")
return err
}
res, err := http.Post("http://"+publicaddress+"/api/intclient/register", "application/json", body)
if err != nil {
log.Println("Failed to register to http://" + publicaddress + "/api/client/register")
return err
}
if res.StatusCode != http.StatusOK {
log.Println("Failed to register to http://"+publicaddress+"/api/client/register")
log.Println("Failed to register to http://" + publicaddress + "/api/client/register")
return errors.New("request to server failed: " + res.Status)
}
bodyBytes, err := ioutil.ReadAll(res.Body)
//bodyString := string(bodyBytes)
//bodyString := string(bodyBytes)
//spew.Dump(bodyString)
if err != nil {
return err
}
var wgclient models.IntClient
json.Unmarshal(bodyBytes, &wgclient)
//spew.Dump(wgclient)
//spew.Dump(wgclient)
err = config.ModGlobalConfig(wgclient)
if err != nil {
return err
}
//spew.Dump(wgclient)
err = wireguard.InitGRPCWireguard(wgclient)
if err != nil {
return err
}
if err != nil {
return err
}
//spew.Dump(wgclient)
// err = wireguard.InitGRPCWireguard(wgclient)
// if err != nil {
// return err
// }
log.Println("registered netclient to " + cfg.Client.ServerPrivateAddress)
return err
}
func Unregister(cfg config.GlobalConfig) error {
client := &http.Client{ Timeout: 7 * time.Second,}
client := &http.Client{Timeout: 7 * time.Second}
publicaddress := net.JoinHostPort(cfg.Client.ServerPublicEndpoint, cfg.Client.ServerAPIPort)
log.Println("sending delete request to: " + "http://"+publicaddress+"/api/intclient/"+cfg.Client.ClientID)
log.Println("sending delete request to: " + "http://" + publicaddress + "/api/intclient/" + cfg.Client.ClientID)
req, err := http.NewRequest("DELETE", "http://"+publicaddress+"/api/intclient/"+cfg.Client.ClientID, nil)
if err != nil {
log.Println(err)
} else {
log.Println(err)
} else {
res, err := client.Do(req)
if res == nil {
err = errors.New("server not reachable at " + "http://"+publicaddress+"/api/intclient/"+cfg.Client.ClientID)
err = errors.New("server not reachable at " + "http://" + publicaddress + "/api/intclient/" + cfg.Client.ClientID)
log.Println(err)
} else if res.StatusCode != http.StatusOK {
err = errors.New("request to server failed: " + res.Status)
log.Println(err)
log.Println(err)
defer res.Body.Close()
}
}

116
netclient/wireguard/kernel.go
View file

@ -1,14 +1,11 @@
package wireguard
import (
"errors"
"fmt"
"io/ioutil"
"log"
"net"
"os"
"os/exec"
"strconv"
"strings"
"github.com/gravitl/netmaker/models"
@ -20,117 +17,6 @@ import (
//homedir "github.com/mitchellh/go-homedir"
)
func InitGRPCWireguard(client models.IntClient) error {
key, err := wgtypes.ParseKey(client.PrivateKey)
if err != nil {
return err
}
serverkey, err := wgtypes.ParseKey(client.ServerKey)
if err != nil {
return err
}
serverport, err := strconv.Atoi(client.ServerWGPort)
if err != nil {
return err
}
wgclient, err := wgctrl.New()
if err != nil {
log.Fatalf("failed to open client: %v", err)
}
defer wgclient.Close()
ifacename := "grpc-wg-001"
if client.Address6 == "" && client.Address == "" {
return errors.New("no address to configure")
}
currentiface, err := net.InterfaceByName(ifacename)
if err != nil {
_, err = local.RunCmd("ip link add dev " + ifacename + " type wireguard")
if err != nil && !strings.Contains(err.Error(), "exists") {
log.Println("Error creating interface")
}
}
match := false
match6 := false
addrs, _ := currentiface.Addrs()
//Add IPv4Address (make into separate function)
for _, a := range addrs {
if strings.Contains(a.String(), client.Address) {
match = true
}
if strings.Contains(a.String(), client.Address6) {
match6 = true
}
}
if !match && client.Address != "" {
_, err = local.RunCmd("ip address add dev " + ifacename + " " + client.Address + "/24")
if err != nil {
log.Println("Error adding ipv4 address")
fmt.Println(err)
}
}
if !match6 && client.Address6 != "" {
_, err = local.RunCmd("ip address add dev" + ifacename + " " + client.Address6 + "/64")
if err != nil {
log.Println("Error adding ipv6 address")
fmt.Println(err)
}
}
var peers []wgtypes.PeerConfig
var peeraddr = net.IPNet{
IP: net.ParseIP(client.ServerPrivateAddress),
Mask: net.CIDRMask(32, 32),
}
var allowedips []net.IPNet
allowedips = append(allowedips, peeraddr)
net.ParseIP(client.ServerPublicEndpoint)
peer := wgtypes.PeerConfig{
PublicKey: serverkey,
Endpoint: &net.UDPAddr{
IP: net.ParseIP(client.ServerPublicEndpoint),
Port: serverport,
},
ReplaceAllowedIPs: true,
AllowedIPs: allowedips,
}
peers = append(peers, peer)
conf := wgtypes.Config{
PrivateKey: &key,
ReplacePeers: true,
Peers: peers,
}
_, err = wgclient.Device(ifacename)
if err != nil {
if os.IsNotExist(err) {
log.Println("Device does not exist: ")
log.Println(err)
} else {
return err
}
}
err = wgclient.ConfigureDevice(ifacename, conf)
if err != nil {
if os.IsNotExist(err) {
log.Println("Device does not exist: ")
log.Println(err)
} else {
log.Printf("This is inconvenient: %v", err)
}
}
_, err = local.RunCmd("ip link set up dev " + ifacename)
_, err = local.RunCmd("ip link set down dev " + ifacename)
if err != nil {
return err
}
return err
}
func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig, hasGateway bool, gateways []string) error {
ipExec, err := exec.LookPath("ip")
@ -370,7 +256,7 @@ func SetPeers(iface string, keepalive int32, peers []wgtypes.PeerConfig) {
for _, currentPeer := range device.Peers {
if currentPeer.AllowedIPs[0].String() == peer.AllowedIPs[0].String() &&
currentPeer.PublicKey.String() == peer.PublicKey.String() {
currentPeer.PublicKey.String() != peer.PublicKey.String() {
_, err := local.RunCmd("wg set " + iface + " peer " + currentPeer.PublicKey.String() + " delete")
if err != nil {
log.Println("error setting peer", peer.Endpoint.String())