TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-05-20 20:52:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix serving wrong cert

Browse source
This commit is contained in:
yusing 2025-02-11 06:20:09 +08:00
parent e1ee08361d
commit 6d0a2cd301
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
agent/pkg/certs/certs.go
View file

@ -134,12 +134,12 @@ func InitCerts() (ca *tls.Certificate, srv *tls.Certificate, isNew bool, err err
return nil, nil, false, err return nil, nil, false, err
} }
cert, err := tls.X509KeyPair(certPEM, keyPEM) caCert, err := tls.X509KeyPair(certPEM, keyPEM)
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
ca = &cert ca = &caCert
// Generate a new private key for the server certificate // Generate a new private key for the server certificate
serverKey, err := rsa.GenerateKey(rand.Reader, 4096) 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 return nil, nil, false, err
} }
cert, err = tls.X509KeyPair(certPEM, keyPEM) agentCert, err := tls.X509KeyPair(certPEM, keyPEM)
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
srv = &cert srv = &agentCert
return ca, srv, true, nil return ca, srv, true, nil
} }

6
cmd/add_agent.go
View file

@ -32,7 +32,11 @@ func AddAgent(args []string) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { 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) zip, err := io.ReadAll(resp.Body)