From 42f904e25a01d66eb7518282e243ffe972f8c73c Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Thu, 29 Aug 2024 18:45:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=8A=E9=94=80=E8=AF=81=E4=B9=A6=20(#6300?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs https://github.com/1Panel-dev/1Panel/issues/4781
---
 agent/app/service/website_ssl.go | 13 +++++++++++++
 agent/utils/ssl/client.go        |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/agent/app/service/website_ssl.go b/agent/app/service/website_ssl.go
index e8143e979..8a3ee6ac2 100644
--- a/agent/app/service/website_ssl.go
+++ b/agent/app/service/website_ssl.go
@@ -410,6 +410,19 @@ func (w WebsiteSSLService) Delete(ids []uint) error {
 				return buserr.New("ErrDeleteWithPanelSSL")
 			}
 		}
+		websiteSSL, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(id))
+		if err != nil {
+			return err
+		}
+		acmeAccount, err := websiteAcmeRepo.GetFirst(commonRepo.WithByID(websiteSSL.AcmeAccountID))
+		if err != nil {
+			return err
+		}
+		client, err := ssl.NewAcmeClient(acmeAccount)
+		if err != nil {
+			return err
+		}
+		_ = client.RevokeSSL([]byte(websiteSSL.Pem))
 		_ = websiteSSLRepo.DeleteBy(commonRepo.WithByID(id))
 	}
 	if len(names) > 0 {
diff --git a/agent/utils/ssl/client.go b/agent/utils/ssl/client.go
index 4799684d3..2d4515e64 100644
--- a/agent/utils/ssl/client.go
+++ b/agent/utils/ssl/client.go
@@ -227,6 +227,10 @@ func (c *AcmeClient) ObtainSSL(domains []string, privateKey crypto.PrivateKey) (
 	return *certificates, nil
 }
 
+func (c *AcmeClient) RevokeSSL(pemSSL []byte) error {
+	return c.Client.Certificate.Revoke(pemSSL)
+}
+
 type Resolve struct {
 	Key   string
 	Value string