mirror of
https://github.com/acepanel/panel.git
synced 2026-02-04 07:57:21 +08:00
feat: 新增使用RSA的自签函数
This commit is contained in:
@@ -259,7 +259,7 @@ func (r *certRepo) ObtainSelfSigned(id uint) error {
|
||||
return err
|
||||
}
|
||||
|
||||
crt, key, err := pkgcert.GenerateSelfSigned(cert.Domains)
|
||||
crt, key, err := pkgcert.GenerateSelfSignedRSA(cert.Domains)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -392,7 +392,7 @@ func (s *CliService) HTTPSGenerate(ctx context.Context, cmd *cli.Command) error
|
||||
}
|
||||
|
||||
if crt == nil || key == nil {
|
||||
crt, key, err = cert.GenerateSelfSigned(names)
|
||||
crt, key, err = cert.GenerateSelfSignedRSA(names)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -199,3 +199,63 @@ func GenerateSelfSigned(names []string) (cert []byte, key []byte, err error) {
|
||||
|
||||
return cert, key, nil
|
||||
}
|
||||
|
||||
// GenerateSelfSignedRSA 生成 RSA-3072 自签名证书
|
||||
func GenerateSelfSignedRSA(hosts []string) (certPEM []byte, keyPEM []byte, err error) {
|
||||
// 1) 生成 RSA 3072 私钥
|
||||
priv, err := rsa.GenerateKey(rand.Reader, 3072)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
// 2) 解析 SAN:DNS + IP
|
||||
var dnsNames []string
|
||||
var ipAddrs []net.IP
|
||||
for _, h := range hosts {
|
||||
if ip := net.ParseIP(h); ip != nil {
|
||||
ipAddrs = append(ipAddrs, ip)
|
||||
} else if h != "" {
|
||||
dnsNames = append(dnsNames, h)
|
||||
}
|
||||
}
|
||||
if len(dnsNames) == 0 && len(ipAddrs) == 0 {
|
||||
return nil, nil, fmt.Errorf("hosts is empty: SAN must not be empty")
|
||||
}
|
||||
|
||||
// 3) 随机 128 位序列号
|
||||
serialLimit := new(big.Int).Lsh(big.NewInt(1), 128)
|
||||
serial, err := rand.Int(rand.Reader, serialLimit)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
now := time.Now().Add(-5 * time.Minute) // 避免时钟偏差导致 not yet valid
|
||||
|
||||
// 4) 组装证书模板
|
||||
tmpl := x509.Certificate{
|
||||
SerialNumber: serial,
|
||||
Subject: pkix.Name{CommonName: "AcePanel"},
|
||||
NotBefore: now,
|
||||
NotAfter: now.AddDate(1, 0, 0), // 1 年
|
||||
|
||||
DNSNames: dnsNames,
|
||||
IPAddresses: ipAddrs,
|
||||
|
||||
KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
|
||||
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
|
||||
BasicConstraintsValid: true,
|
||||
}
|
||||
|
||||
der, err := x509.CreateCertificate(rand.Reader, &tmpl, &tmpl, &priv.PublicKey, priv)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
// 5) 输出 PEM
|
||||
certPEM = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
|
||||
|
||||
keyBytes := x509.MarshalPKCS1PrivateKey(priv)
|
||||
keyPEM = pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: keyBytes})
|
||||
|
||||
return certPEM, keyPEM, nil
|
||||
}
|
||||
|
||||
@@ -20,3 +20,10 @@ func (s *CertTestSuite) TestGenerateSelfSigned() {
|
||||
s.NotNil(pem)
|
||||
s.NotNil(key)
|
||||
}
|
||||
|
||||
func (s *CertTestSuite) TestGenerateSelfSignedRSA() {
|
||||
pem, key, err := GenerateSelfSignedRSA([]string{"haozi.dev"})
|
||||
s.Nil(err)
|
||||
s.NotNil(pem)
|
||||
s.NotNil(key)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user