|
@@ -1,10 +1,8 @@
|
|
package functions
|
|
package functions
|
|
|
|
|
|
import (
|
|
import (
|
|
- "crypto/x509"
|
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
"errors"
|
|
"errors"
|
|
- "io/ioutil"
|
|
|
|
"log"
|
|
"log"
|
|
"net/http"
|
|
"net/http"
|
|
|
|
|
|
@@ -36,19 +34,11 @@ func Register(cfg *config.ClientConfig) error {
|
|
if response.StatusCode != http.StatusOK {
|
|
if response.StatusCode != http.StatusOK {
|
|
return errors.New(response.Status)
|
|
return errors.New(response.Status)
|
|
}
|
|
}
|
|
-
|
|
|
|
- body, err := ioutil.ReadAll(response.Body)
|
|
|
|
- if err != nil {
|
|
|
|
- log.Fatal(err)
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- log.Println(string(body))
|
|
|
|
- var cert *x509.Certificate
|
|
|
|
- if err := json.Unmarshal(body, cert); err != nil {
|
|
|
|
- //if err := json.NewDecoder(response.Body).Decode(cert); err != nil {
|
|
|
|
|
|
+ var resp config.RegisterResponse
|
|
|
|
+ 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())
|
|
}
|
|
}
|
|
- if err := tls.SaveCert(ncutils.GetNetclientPath()+cfg.Server.Server, "root.cert", cert); err != nil {
|
|
|
|
|
|
+ if err := tls.SaveCert(ncutils.GetNetclientPath()+cfg.Server.Server, "root.cert", &resp.CA); err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
logger.Log(0, "server certificate saved ")
|
|
logger.Log(0, "server certificate saved ")
|