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

cleanup and comments

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-04-16 16:43:10 -04:00
parent de7ca68c23
commit f8fe382c02
6 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
netclient/functions/register.go
View File

@@ -24,17 +24,19 @@ func Register(cfg *config.ClientConfig) error {
if cfg.Server.AccessKey == "" {
return errors.New("no access key provided")
}
//create certificate request
_, private, err := ed25519.GenerateKey(rand.Reader)
//generate new key if one doesn' exist
private, err := tls.ReadKey("/etc/netclient/client.key")
if err != nil {
return err
}
//csr, err := tls.NewCSR(private, name)
if err != nil {
return err
_, *private, err = ed25519.GenerateKey(rand.Reader)
if err != nil {
return err
}
if err := tls.SaveKey(ncutils.GetNetclientPath(), "client.key", *private); err != nil {
return err
}
}
data := config.RegisterRequest{
Key: private,
Key: *private,
CommonName: tls.NewCName(os.Getenv("HOSTNAME")),
}
payload, err := json.Marshal(data)
@@ -43,7 +45,6 @@ func Register(cfg *config.ClientConfig) error {
}
url := "https://" + cfg.Server.API + "/api/server/register"
log.Println("register at ", url)
request, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(payload))
if err != nil {
return err
@@ -62,19 +63,17 @@ func Register(cfg *config.ClientConfig) error {
if err := json.NewDecoder(response.Body).Decode(&resp); err != nil {
return errors.New("unmarshal cert error " + err.Error())
}
//x509.Certificate.PublicKey is an interface so json encoding/decoding results in a string rather that []byte
//the pubkeys are included in the response so the values in the certificate can be updated appropriately
resp.CA.PublicKey = resp.CAPubKey
resp.Cert.PublicKey = resp.CertPubKey
if err := tls.SaveCert(ncutils.GetNetclientPath()+cfg.Server.Server+"/", "root.pem", &resp.CA); err != nil {
return err
}
if err := tls.SaveCert(ncutils.GetNetclientPath()+cfg.Server.Server+"/", "client.pem", &resp.Cert); err != nil {
return err
}
if err := tls.SaveKey(ncutils.GetNetclientPath(), "client.key", private); err != nil {
return err
}
logger.Log(0, "certificates/key saved ")
//join the network defined in the token
return JoinNetwork(cfg, "", false)
}