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

idk

Browse Source
This commit is contained in:
0xdcarns
2022-04-15 15:20:46 -04:00
parent 1cf9ac77e9
commit 08e219cdcc
3 changed files with 54 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
controllers/server.go
View File

@@ -176,30 +176,32 @@ func register(w http.ResponseWriter, r *http.Request) {
return return
} }
caBytes, err := config.ConvertCertToBytes(*ca) // caBytes, err := config.ConvertCertToBytes(*ca)
if err != nil { // if err != nil {
logger.Log(0, "failed to encode CA cert ", err.Error()) // logger.Log(0, "failed to encode CA cert ", err.Error())
errorResponse := models.ErrorResponse{ // errorResponse := models.ErrorResponse{
Code: http.StatusInternalServerError, Message: err.Error(), // Code: http.StatusInternalServerError, Message: err.Error(),
} // }
returnErrorResponse(w, r, errorResponse) // returnErrorResponse(w, r, errorResponse)
return // return
} // }
certBytes, err := config.ConvertCertToBytes(*cert) // certBytes, err := config.ConvertCertToBytes(*cert)
if err != nil { // if err != nil {
logger.Log(0, "failed to encode CA cert ", err.Error()) // logger.Log(0, "failed to encode CA cert ", err.Error())
errorResponse := models.ErrorResponse{ // errorResponse := models.ErrorResponse{
Code: http.StatusInternalServerError, Message: err.Error(), // Code: http.StatusInternalServerError, Message: err.Error(),
} // }
returnErrorResponse(w, r, errorResponse) // returnErrorResponse(w, r, errorResponse)
return // return
} // }
response := config.RegisterResponse{ response := config.RegisterResponse{
Key: *key, Key: *key,
CABytes: caBytes, CA: *ca,
CertBytes: certBytes, CAPubKey: (ca.PublicKey).(ed25519.PublicKey),
Cert: *cert,
CertPubKey: (cert.PublicKey).(ed25519.PublicKey),
} }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(response) json.NewEncoder(w).Encode(response)

49
netclient/config/config.go
View File

@@ -2,11 +2,10 @@ package config
import ( import (
//"github.com/davecgh/go-spew/spew" //"github.com/davecgh/go-spew/spew"
"bytes"
"crypto/ed25519" "crypto/ed25519"
"crypto/x509" "crypto/x509"
"encoding/base64" "encoding/base64"
"encoding/gob"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
@@ -48,33 +47,35 @@ type RegisterRequest struct {
Key ed25519.PublicKey Key ed25519.PublicKey
} }
// ConvertStructToByte - util to convert bytes to a key to use elsewhere // // ConvertStructToByte - util to convert bytes to a key to use elsewhere
func ConvertCertToBytes(cert x509.Certificate) ([]byte, error) { // func ConvertCertToBytes(cert x509.Certificate) ([]byte, error) {
var buffer bytes.Buffer // var buffer bytes.Buffer
var enc = gob.NewEncoder(&buffer) // var enc = gob.NewEncoder(&buffer)
if err := enc.Encode(cert); err != nil { // if err := enc.Encode(cert); err != nil {
return nil, err // return nil, err
} // }
return buffer.Bytes(), nil // return buffer.Bytes(), nil
} // }
// ConvertStructToByte - util to convert bytes to a key to use elsewhere // // ConvertStructToByte - util to convert bytes to a key to use elsewhere
func ConvertBytesToCert(data []byte) (x509.Certificate, error) { // func ConvertBytesToCert(data []byte) (x509.Certificate, error) {
var buffer = bytes.NewBuffer(data) // var buffer = bytes.NewBuffer(data)
var dec = gob.NewDecoder(buffer) // var dec = gob.NewDecoder(buffer)
var result = new(x509.Certificate) // var result = new(x509.Certificate)
var err = dec.Decode(result) // var err = dec.Decode(result)
if err != nil { // if err != nil {
return *result, err // return *result, err
} // }
return *result, nil // return *result, nil
} // }
// RegisterResponse - the response to register function // RegisterResponse - the response to register function
type RegisterResponse struct { type RegisterResponse struct {
Key ed25519.PrivateKey Key ed25519.PrivateKey
CABytes []byte CA x509.Certificate
CertBytes []byte CAPubKey ed25519.PublicKey
Cert x509.Certificate
CertPubKey ed25519.PublicKey
} }
// Write - writes the config of a client to disk // Write - writes the config of a client to disk

15
netclient/functions/register.go
View File

@@ -63,19 +63,14 @@ func Register(cfg *config.ClientConfig) error {
if err := json.NewDecoder(response.Body).Decode(&resp); err != nil { if err := json.NewDecoder(response.Body).Decode(&resp); err != nil {
return errors.New("unmarshal cert error " + err.Error()) return errors.New("unmarshal cert error " + err.Error())
} }
responseCA, err := config.ConvertBytesToCert(resp.CABytes)
if err != nil {
return errors.New("could not acquire CA from response " + err.Error())
}
responseCert, err := config.ConvertBytesToCert(resp.CertBytes)
if err != nil {
return errors.New("could not acquire client certificate from response " + err.Error())
}
if err := tls.SaveCert(ncutils.GetNetclientPath()+cfg.Server.Server+"/", "root.pem", &responseCA); err != nil { 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 return err
} }
if err := tls.SaveCert(ncutils.GetNetclientPath()+cfg.Server.Server+"/", "client.pem", &responseCert); err != nil { if err := tls.SaveCert(ncutils.GetNetclientPath()+cfg.Server.Server+"/", "client.pem", &resp.Cert); err != nil {
return err return err
} }
if err := tls.SaveKey(ncutils.GetNetclientPath(), "client.key", private); err != nil { if err := tls.SaveKey(ncutils.GetNetclientPath(), "client.key", private); err != nil {