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

adjusted values to pointers for a lot of functions

Browse source
This commit is contained in:
0xdcarns 2021-12-07 15:04:00 -05:00
parent 0c6c09caa9
commit 6215ea2db8
8 changed files with 31 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
controllers/common_test.go
View file

@ -25,7 +25,7 @@ func TestGetPeerList(t *testing.T) {
assert.Equal(t, node.Address, peers[0].Address)
})
t.Run("Multiple Nodes", func(t *testing.T) {
createnode := models.Node{PublicKey: "RM5qhLAE20PG9BbfBCger+Ac9D2NDOwCtY1rbYDLf34=", Endpoint: "10.0.0.2", MacAddress: "02:02:03:04:05:06", Password: "password", Network: "skynet"}
createnode := &models.Node{PublicKey: "RM5qhLAE20PG9BbfBCger+Ac9D2NDOwCtY1rbYDLf34=", Endpoint: "10.0.0.2", MacAddress: "02:02:03:04:05:06", Password: "password", Network: "skynet"}
logic.CreateNode(createnode, "skynet")
peers, err := logic.GetPeersList("skynet", false, "")
assert.Nil(t, err)
@ -95,7 +95,7 @@ func TestCreateNode(t *testing.T) {
database.InitializeDatabase()
deleteAllNetworks()
createNet()
createnode := models.Node{PublicKey: "DM5qhLAE20PG9BbfBCger+Ac9D2NDOwCtY1rbYDLf34=", Endpoint: "10.0.0.1", MacAddress: "01:02:03:04:05:06", Password: "password", Network: "skynet"}
createnode := &models.Node{PublicKey: "DM5qhLAE20PG9BbfBCger+Ac9D2NDOwCtY1rbYDLf34=", Endpoint: "10.0.0.1", MacAddress: "01:02:03:04:05:06", Password: "password", Network: "skynet"}
//err := ValidateNodeCreate("skynet", createnode)
//assert.Nil(t, err)
node, err := logic.CreateNode(createnode, "skynet")
@ -123,8 +123,8 @@ func TestSetNetworkNodesLastModified(t *testing.T) {
})
}
func createTestNode() models.Node {
func createTestNode() *models.Node {
createnode := models.Node{PublicKey: "DM5qhLAE20PG9BbfBCger+Ac9D2NDOwCtY1rbYDLf34=", Name: "testnode", Endpoint: "10.0.0.1", MacAddress: "01:02:03:04:05:06", Password: "password", Network: "skynet"}
node, _ := logic.CreateNode(createnode, "skynet")
node, _ := logic.CreateNode(&createnode, "skynet")
return node
}

2
controllers/dns_test.go
View file

@ -54,7 +54,7 @@ func TestGetNodeDNS(t *testing.T) {
assert.Equal(t, "10.0.0.1", dns[0].Address)
})
t.Run("MultipleNodes", func(t *testing.T) {
createnode := models.Node{PublicKey: "DM5qhLAE20PG9BbfBCger+Ac9D2NDOwCtY1rbYDLf34=", Endpoint: "10.100.100.3", MacAddress: "01:02:03:04:05:07", Password: "password", Network: "skynet"}
createnode := &models.Node{PublicKey: "DM5qhLAE20PG9BbfBCger+Ac9D2NDOwCtY1rbYDLf34=", Endpoint: "10.100.100.3", MacAddress: "01:02:03:04:05:07", Password: "password", Network: "skynet"}
_, err := logic.CreateNode(createnode, "skynet")
assert.Nil(t, err)
dns, err := logic.GetNodeDNS("skynet")

6
controllers/node.go
View file

@ -379,10 +379,10 @@ func createNode(w http.ResponseWriter, r *http.Request) {
return
}
var node models.Node
var node = &models.Node{}
//get node from body of request
err = json.NewDecoder(r.Body).Decode(&node)
err = json.NewDecoder(r.Body).Decode(node)
if err != nil {
returnErrorResponse(w, r, formatError(err, "internal"))
return
@ -390,7 +390,7 @@ func createNode(w http.ResponseWriter, r *http.Request) {
node.Network = networkName
network, err := logic.GetNetworkByNode(&node)
network, err := logic.GetNetworkByNode(node)
if err != nil {
returnErrorResponse(w, r, formatError(err, "internal"))
return

4
controllers/node_grpc.go
View file

@ -51,9 +51,9 @@ func (s *NodeServiceServer) ReadNode(ctx context.Context, req *nodepb.Object) (*
func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.Object) (*nodepb.Object, error) {
// Get the protobuf node type from the protobuf request type
// Essentially doing req.Node to access the struct with a nil check
var node models.Node
var node = &models.Node{}
data := req.GetData()
if err := json.Unmarshal([]byte(data), &node); err != nil {
if err := json.Unmarshal([]byte(data), node); err != nil {
return nil, err
}

43
logic/server.go
View file

@ -31,8 +31,7 @@ func ServerJoin(network string, serverID string, privateKey string) error {
}
var err error
var node *models.Node // fill this object with server node specifics
node = &models.Node{
var node = &models.Node{
IsServer: "yes",
DNSOn: "no",
IsStatic: "yes",
@ -74,30 +73,11 @@ func ServerJoin(network string, serverID string, privateKey string) error {
privateKey = wgPrivatekey.String()
node.PublicKey = wgPrivatekey.PublicKey().String()
}
// should never set mac address for server anymore
var postnode *models.Node
postnode = &models.Node{
Password: node.Password,
MacAddress: node.MacAddress,
AccessKey: node.AccessKey,
Network: network,
ListenPort: node.ListenPort,
PostUp: node.PostUp,
PostDown: node.PostDown,
PersistentKeepalive: node.PersistentKeepalive,
LocalAddress: node.LocalAddress,
Interface: node.Interface,
PublicKey: node.PublicKey,
DNSOn: node.DNSOn,
Name: node.Name,
Endpoint: node.Endpoint,
SaveConfig: node.SaveConfig,
UDPHolePunch: node.UDPHolePunch,
}
node.Network = network
logger.Log(2, "adding a server instance on network", postnode.Network)
*node, err = CreateNode(*postnode, network)
logger.Log(2, "adding a server instance on network", node.Network)
node, err = CreateNode(node, network)
if err != nil {
return err
}
@ -194,7 +174,7 @@ func ServerPull(serverNode *models.Node, onErr bool) (*models.Node, error) {
logger.Log(1, "removed old interface", oldIfaceName)
}
serverNode.PullChanges = "no"
if err = setWGConfig(*serverNode, serverNode.Network, false); err != nil {
if err = setWGConfig(serverNode, serverNode.Network, false); err != nil {
return serverNode, err
}
// handle server side update
@ -202,7 +182,7 @@ func ServerPull(serverNode *models.Node, onErr bool) (*models.Node, error) {
return serverNode, err
}
} else {
if err = setWGConfig(*serverNode, serverNode.Network, true); err != nil {
if err = setWGConfig(serverNode, serverNode.Network, true); err != nil {
if errors.Is(err, os.ErrNotExist) {
return ServerPull(serverNode, true)
} else {
@ -234,6 +214,11 @@ func ServerLeave(mac string, network string) error {
return DeleteNode(&serverNode, true)
}
/**
* Below function needs major refactor
*
*/
// GetServerPeers - gets peers of server
func GetServerPeers(macaddress string, network string, dualstack bool, isIngressGateway bool) ([]wgtypes.PeerConfig, bool, []string, error) {
hasGateway := false
@ -373,7 +358,7 @@ func GetServerPeers(macaddress string, network string, dualstack bool, isIngress
logger.Log(1, "ERROR RETRIEVING EXTERNAL PEERS ON SERVER:", err.Error())
}
}
return peers, hasGateway, gateways, err
return peers[:], hasGateway, gateways[:], err
}
// GetServerExtPeers - gets the extpeers for a client
@ -436,7 +421,7 @@ func GetServerExtPeers(macaddress string, network string, dualstack bool) ([]wgt
}
peers = append(peers, peer)
}
return peers, err
return peers[:], err
}
// == Private ==
@ -448,7 +433,7 @@ func isDeleteError(err error) bool {
func checkNodeActions(node *models.Node, networkName string, localNode *models.Node) string {
if (node.Action == models.NODE_UPDATE_KEY || localNode.Action == models.NODE_UPDATE_KEY) &&
node.IsStatic != "yes" {
err := setWGKeyConfig(*node)
err := setWGKeyConfig(node)
if err != nil {
logger.Log(1, "unable to process reset keys request:", err.Error())
return ""

6
logic/util.go
View file

@ -76,7 +76,7 @@ func DeleteNode(node *models.Node, exterminate bool) error {
}
// CreateNode - creates a node in database
func CreateNode(node models.Node, networkName string) (models.Node, error) {
func CreateNode(node *models.Node, networkName string) (*models.Node, error) {
//encrypt that password so we never see it
hash, err := bcrypt.GenerateFromPassword([]byte(node.Password), 5)
@ -98,7 +98,7 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
node.DNSOn = "no"
}
}
SetNodeDefaults(&node)
SetNodeDefaults(node)
node.Address, err = UniqueAddress(networkName)
if err != nil {
return node, err
@ -113,7 +113,7 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
//returnErrorResponse(w, r, errorResponse)
return node, err
}
err = ValidateNode(&node, false)
err = ValidateNode(node, false)
if err != nil {
return node, err
}

6
logic/wireguard.go
View file

@ -280,7 +280,7 @@ func setServerPeers(iface string, keepalive int32, peers []wgtypes.PeerConfig) e
return nil
}
func setWGConfig(node models.Node, network string, peerupdate bool) error {
func setWGConfig(node *models.Node, network string, peerupdate bool) error {
node.SetID()
peers, hasGateway, gateways, err := GetServerPeers(node.MacAddress, node.Network, node.IsDualStack == "yes", node.IsIngressGateway == "yes")
@ -296,13 +296,13 @@ func setWGConfig(node models.Node, network string, peerupdate bool) error {
err = setServerPeers(iface, node.PersistentKeepalive, peers)
logger.Log(2, "updated peers on server", node.Name)
} else {
err = initWireguard(&node, privkey, peers, hasGateway, gateways)
err = initWireguard(node, privkey, peers, hasGateway, gateways)
logger.Log(3, "finished setting wg config on server", node.Name)
}
return err
}
func setWGKeyConfig(node models.Node) error {
func setWGKeyConfig(node *models.Node) error {
node.SetID()
privatekey, err := wgtypes.GeneratePrivateKey()

2
serverctl/serverctl.go
View file

@ -77,7 +77,7 @@ func HandleContainedClient() error {
logger.Log(3, "completed peers check of network", serverNet.NetID)
}
}
err := SyncNetworks(servernets)
err := SyncNetworks(servernets[:])
if err != nil {
logger.Log(1, "error syncing networks:", err.Error())
}