From b8d3ab4f61f57582b654bcdeab285966b088a427 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Thu, 7 Dec 2023 17:32:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=9D=A2=E6=9D=BF=E8=AE=BE=E7=BD=AE=20?=
 =?UTF-8?q?SSL=20=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=20(#3219)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/dto/setting.go                    |  2 +-
 backend/app/service/setting.go                | 15 +++++-
 frontend/src/views/setting/safe/index.vue     |  2 +-
 frontend/src/views/setting/safe/ssl/index.vue | 47 +++++++++++++++++--
 4 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/backend/app/dto/setting.go b/backend/app/dto/setting.go
index 866734261..5da1a3dc0 100644
--- a/backend/app/dto/setting.go
+++ b/backend/app/dto/setting.go
@@ -60,7 +60,7 @@ type SettingUpdate struct {
 }
 
 type SSLUpdate struct {
-	SSLType string `json:"sslType"`
+	SSLType string `json:"sslType" validate:"required,oneof=self select import-paste import-local"`
 	Domain  string `json:"domain"`
 	SSL     string `json:"ssl" validate:"required,oneof=enable disable"`
 	Cert    string `json:"cert"`
diff --git a/backend/app/service/setting.go b/backend/app/service/setting.go
index 6c5cf55b4..d7192145f 100644
--- a/backend/app/service/setting.go
+++ b/backend/app/service/setting.go
@@ -174,6 +174,7 @@ func (u *SettingService) UpdatePort(port uint) error {
 		return err
 	}
 	go func() {
+		time.Sleep(1 * time.Second)
 		_, err := cmd.Exec("systemctl restart 1panel.service")
 		if err != nil {
 			global.LOG.Errorf("restart system port failed, err: %v", err)
@@ -249,9 +250,20 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error {
 		if err := settingRepo.Update("SSLID", strconv.Itoa(int(req.SSLID))); err != nil {
 			return err
 		}
-	case "import":
+	case "import-paste":
 		secret = req.Cert
 		key = req.Key
+	case "import-local":
+		keyFile, err := os.ReadFile(req.Key)
+		if err != nil {
+			return err
+		}
+		key = string(keyFile)
+		certFile, err := os.ReadFile(req.Cert)
+		if err != nil {
+			return err
+		}
+		secret = string(certFile)
 	}
 
 	fileOp := files.NewFileOp()
@@ -274,6 +286,7 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error {
 		return err
 	}
 	go func() {
+		time.Sleep(1 * time.Second)
 		_, err := cmd.Exec("systemctl restart 1panel.service")
 		if err != nil {
 			global.LOG.Errorf("restart system failed, err: %v", err)
diff --git a/frontend/src/views/setting/safe/index.vue b/frontend/src/views/setting/safe/index.vue
index b04a1ade4..3f43b2746 100644
--- a/frontend/src/views/setting/safe/index.vue
+++ b/frontend/src/views/setting/safe/index.vue
@@ -299,7 +299,7 @@ const handleSSL = async () => {
         type: 'info',
     })
         .then(async () => {
-            await updateSSL({ ssl: 'disable', domain: '', sslType: '', key: '', cert: '', sslID: 0 });
+            await updateSSL({ ssl: 'disable', domain: '', sslType: form.sslType, key: '', cert: '', sslID: 0 });
             MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
             let href = window.location.href;
             globalStore.isLogin = false;
diff --git a/frontend/src/views/setting/safe/ssl/index.vue b/frontend/src/views/setting/safe/ssl/index.vue
index b110ec287..efc5c0dde 100644
--- a/frontend/src/views/setting/safe/ssl/index.vue
+++ b/frontend/src/views/setting/safe/ssl/index.vue
@@ -30,6 +30,12 @@
                                 {{ $t('setting.selfSignedHelper') }}
                             </span>
                         </el-form-item>
+                        <el-form-item v-if="form.sslType === 'import'" :label="$t('commons.button.import')" prop="type">
+                            <el-select v-model="form.itemSSLType">
+                                <el-option :label="$t('website.pasteSSL')" value="paste"></el-option>
+                                <el-option :label="$t('website.localSSL')" value="local"></el-option>
+                            </el-select>
+                        </el-form-item>
 
                         <el-form-item v-if="form.timeout">
                             <el-tag>{{ $t('setting.domainOrIP') }} {{ form.domain }}</el-tag>
@@ -46,7 +52,7 @@
                             </el-button>
                         </el-form-item>
 
-                        <div v-if="form.sslType === 'import'">
+                        <div v-if="form.sslType === 'import' && form.itemSSLType === 'paste'">
                             <el-form-item :label="$t('website.privateKey')" prop="key">
                                 <el-input v-model="form.key" :autosize="{ minRows: 5, maxRows: 10 }" type="textarea" />
                             </el-form-item>
@@ -55,6 +61,23 @@
                             </el-form-item>
                         </div>
 
+                        <div v-if="form.sslType === 'import' && form.itemSSLType === 'local'">
+                            <el-form-item :label="$t('website.privateKey')" prop="key">
+                                <el-input v-model="form.key">
+                                    <template #prepend>
+                                        <FileList @choose="getKeyPath" :dir="false"></FileList>
+                                    </template>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item class="marginTop" :label="$t('website.certificate')" prop="cert">
+                                <el-input v-model="form.cert">
+                                    <template #prepend>
+                                        <FileList @choose="getCertPath" :dir="false"></FileList>
+                                    </template>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+
                         <div v-if="form.sslType === 'select'">
                             <el-form-item :label="$t('setting.certificate')" prop="sslID">
                                 <el-select v-model="form.sslID" @change="changeSSl(form.sslID)">
@@ -129,6 +152,7 @@ const form = reactive({
     ssl: 'enable',
     domain: '',
     sslType: 'self',
+    itemSSLType: 'paste',
     sslID: null as number,
     cert: '',
     key: '',
@@ -152,7 +176,12 @@ interface DialogProps {
     sslInfo?: Setting.SSLInfo;
 }
 const acceptParams = async (params: DialogProps): Promise<void> => {
-    form.sslType = params.sslType;
+    if (params.sslType.indexOf('-') !== -1) {
+        form.sslType = 'import';
+        form.itemSSLType = params.sslType.split('-')[1];
+    } else {
+        form.sslType = params.sslType;
+    }
     form.cert = params.sslInfo?.cert || '';
     form.key = params.sslInfo?.key || '';
     form.rootPath = params.sslInfo?.rootPath || '';
@@ -183,6 +212,14 @@ const changeSSl = (sslid: number) => {
     itemSSL.value = res[0];
 };
 
+const getKeyPath = (path: string) => {
+    form.key = path;
+};
+
+const getCertPath = (path: string) => {
+    form.cert = path;
+};
+
 const onDownload = async () => {
     await downloadSSL().then(async (file) => {
         const downloadUrl = window.URL.createObjectURL(new Blob([file]));
@@ -204,9 +241,13 @@ const onSaveSSL = async (formEl: FormInstance | undefined) => {
             cancelButtonText: i18n.global.t('commons.button.cancel'),
             type: 'info',
         }).then(async () => {
+            let itemType = form.sslType;
+            if (form.sslType === 'import') {
+                itemType = form.itemSSLType === 'paste' ? 'import-paste' : 'import-local';
+            }
             let param = {
                 ssl: 'enable',
-                sslType: form.sslType,
+                sslType: itemType,
                 domain: '',
                 sslID: form.sslID,
                 cert: form.cert,