mirror of
https://github.com/yusing/godoxy.git
synced 2026-03-17 23:14:21 +01:00
fix serving wrong cert
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user