zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

redo register on pull

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-04-25 14:30:51 -04:00
parent e3206c5b4c
commit 092441441c
4 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
netclient/command/commands.go
View File

@@ -1,6 +1,8 @@
package command
import (
"crypto/ed25519"
"crypto/rand"
"strings"
"github.com/gravitl/netmaker/logger"
@@ -8,6 +10,7 @@ import (
"github.com/gravitl/netmaker/netclient/daemon"
"github.com/gravitl/netmaker/netclient/functions"
"github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/tls"
)
// Join - join command to run from cli
@@ -78,7 +81,7 @@ func Pull(cfg *config.ClientConfig) error {
return err
}
for _, network := range networks {
_, err = functions.Pull(network, true, true)
_, err = functions.Pull(network, true)
if err != nil {
logger.Log(1, "Error pulling network config for network: ", network, "\n", err.Error())
} else {
@@ -87,7 +90,20 @@ func Pull(cfg *config.ClientConfig) error {
}
err = nil
} else {
_, err = functions.Pull(cfg.Network, true, true)
_, err = functions.Pull(cfg.Network, true)
_, newKey, kerr := ed25519.GenerateKey(rand.Reader)
if kerr == nil {
if kerr := tls.SaveKey(ncutils.GetNetclientPath(), "/client.key", newKey); err != nil {
logger.Log(0, "error saving key", kerr.Error())
} else {
if kerr = functions.RegisterWithServer(&newKey, cfg); err != nil {
logger.Log(0, "registration error", kerr.Error())
} else {
daemon.Restart()
}
}
}
}
logger.Log(1, "reset network and peer configs")
if err == nil {