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

refactor logic for client.key generation

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-06-22 09:55:10 -04:00
parent a3593212c5
commit c8ec46391d
5 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
netclient/command/commands.go
View File

@@ -92,19 +92,25 @@ func Pull(cfg *config.ClientConfig) error {
currentServers[currCfg.Server.Server] = *currCfg
}
//generate new client key if one doesn' exist
var private *ed25519.PrivateKey
private, err = tls.ReadKey(ncutils.GetNetclientPath() + ncutils.GetSeparator() + "client.key")
if err != nil {
_, newKey, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
return err
}
if err := tls.SaveKey(ncutils.GetNetclientPath(), ncutils.GetSeparator()+"client.key", newKey); err != nil {
return err
}
private = &newKey
}
// re-register with server -- get new certs for broker
for _, clientCfg := range currentServers {
_, newKey, kerr := ed25519.GenerateKey(rand.Reader)
if kerr == nil && err == nil {
if kerr := tls.SaveKey(ncutils.GetNetclientPath(), ncutils.GetSeparator()+"client.key", newKey); kerr != nil {
logger.Log(0, "error saving key", kerr.Error())
} else {
if kerr = functions.RegisterWithServer(&newKey, &clientCfg); err != nil {
logger.Log(0, "registration error", kerr.Error())
} else {
daemon.Restart()
}
}
if err = functions.RegisterWithServer(private, &clientCfg); err != nil {
logger.Log(0, "registration error", err.Error())
} else {
daemon.Restart()
}
}
logger.Log(1, "reset network and peer configs")