fanhuadesenlinnn/1Panel
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/1Panel-dev/1Panel.git synced 2026-09-20 08:03:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: optimize self-signed certificate format (#13771)

Browse Source
This commit is contained in:
CityFun
2026-09-09 18:27:17 +08:00
committed by GitHub
parent 033cc7c2d1
commit 605c8cc6db
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
agent/app/service/website_ca.go
View File

@@ -303,7 +303,7 @@ func (w WebsiteCAService) ObtainSSL(req request.WebsiteCAObtain) (*model.Website
NotAfter: notAfter, NotAfter: notAfter,
BasicConstraintsValid: true, BasicConstraintsValid: true,
IsCA: false, IsCA: false,
KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment, KeyUsage: leafKeyUsage(websiteSSL.KeyType),
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
DNSNames: domains, DNSNames: domains,
IPAddresses: ips, IPAddresses: ips,
@@ -366,6 +366,14 @@ func (w WebsiteCAService) ObtainSSL(req request.WebsiteCAObtain) (*model.Website
return websiteSSL, nil return websiteSSL, nil
} }
func leafKeyUsage(keyType string) x509.KeyUsage {
usage := x509.KeyUsageDigitalSignature
if ssl.KeyType(keyType) != certcrypto.EC256 && ssl.KeyType(keyType) != certcrypto.EC384 {
usage |= x509.KeyUsageKeyEncipherment
}
return usage
}
func createPrivateKey(keyType string) (privateKey any, publicKey any, privateKeyBytes []byte, err error) { func createPrivateKey(keyType string) (privateKey any, publicKey any, privateKeyBytes []byte, err error) {
privateKey, err = certcrypto.GeneratePrivateKey(ssl.KeyType(keyType)) privateKey, err = certcrypto.GeneratePrivateKey(ssl.KeyType(keyType))
if err != nil { if err != nil {