From 6d0a2cd30174e7e7fa591969726d0ecf0e0b2a4b Mon Sep 17 00:00:00 2001 From: yusing Date: Tue, 11 Feb 2025 06:20:09 +0800 Subject: [PATCH] fix serving wrong cert --- agent/pkg/certs/certs.go | 8 ++++---- cmd/add_agent.go | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/agent/pkg/certs/certs.go b/agent/pkg/certs/certs.go index d9cc984..9051274 100644 --- a/agent/pkg/certs/certs.go +++ b/agent/pkg/certs/certs.go @@ -134,12 +134,12 @@ func InitCerts() (ca *tls.Certificate, srv *tls.Certificate, isNew bool, err err return nil, nil, false, err } - cert, err := tls.X509KeyPair(certPEM, keyPEM) + caCert, err := tls.X509KeyPair(certPEM, keyPEM) if err != nil { return nil, nil, false, err } - ca = &cert + ca = &caCert // Generate a new private key for the server certificate serverKey, err := rsa.GenerateKey(rand.Reader, 4096) @@ -161,12 +161,12 @@ func InitCerts() (ca *tls.Certificate, srv *tls.Certificate, isNew bool, err err return nil, nil, false, err } - cert, err = tls.X509KeyPair(certPEM, keyPEM) + agentCert, err := tls.X509KeyPair(certPEM, keyPEM) if err != nil { return nil, nil, false, err } - srv = &cert + srv = &agentCert return ca, srv, true, nil } diff --git a/cmd/add_agent.go b/cmd/add_agent.go index 5668025..68ac55a 100644 --- a/cmd/add_agent.go +++ b/cmd/add_agent.go @@ -32,7 +32,11 @@ func AddAgent(args []string) { defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - logging.Fatal().Int("status", resp.StatusCode).Msg("failed to add agent") + msg, err := io.ReadAll(resp.Body) + if err != nil { + msg = []byte("unknown error") + } + logging.Fatal().Int("status", resp.StatusCode).Str("msg", string(msg)).Msg("failed to add agent") } zip, err := io.ReadAll(resp.Body)