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

refactoring cert logic to use database

Browse Source
This commit is contained in:
afeiszli
2022-06-30 22:30:28 -04:00
parent b281047168
commit f28d361bea
5 changed files with 124 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/server.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/servercfg"
"github.com/gravitl/netmaker/serverctl"
"github.com/gravitl/netmaker/tls"
)
@@ -142,12 +143,12 @@ func register(w http.ResponseWriter, r *http.Request) {
// genCerts generates a client certificate and returns the certificate and root CA
func genCerts(clientKey *ed25519.PrivateKey, name *pkix.Name) (*x509.Certificate, *x509.Certificate, error) {
ca, err := tls.ReadCertFromFile("/etc/netmaker/root.pem")
ca, err := serverctl.ReadCertFromDB(tls.ROOT_PEM_NAME)
if err != nil {
logger.Log(2, "root ca not found ", err.Error())
return nil, nil, fmt.Errorf("root ca not found %w", err)
}
key, err := tls.ReadKeyFromFile("/etc/netmaker/root.key")
key, err := serverctl.ReadKeyFromDB(tls.ROOT_KEY_NAME)
if err != nil {
logger.Log(2, "root key not found ", err.Error())
return nil, nil, fmt.Errorf("root key not found %w", err)