From 18cbcb7f13d2093192d6ebfc87336180623a4d16 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Thu, 14 Dec 2023 12:56:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84=20Fail2b?=
 =?UTF-8?q?an=20=E9=85=8D=E7=BD=AE=20(#3322)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/fail2ban.go               | 10 +++++++---
 frontend/src/views/toolbox/fail2ban/index.vue |  9 +++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend/app/service/fail2ban.go b/backend/app/service/fail2ban.go
index 6f1fa6096..59684ccc0 100644
--- a/backend/app/service/fail2ban.go
+++ b/backend/app/service/fail2ban.go
@@ -39,12 +39,16 @@ func (u *Fail2BanService) LoadBaseInfo() (dto.Fail2BanBaseInfo, error) {
 	baseInfo.IsEnable, baseInfo.IsActive, baseInfo.IsExist = client.Status()
 	if !baseInfo.IsActive {
 		baseInfo.Version = "-"
-		return baseInfo, nil
+	} else {
+		baseInfo.Version = client.Version()
 	}
-	baseInfo.Version = client.Version()
 	conf, err := os.ReadFile(defaultFail2BanPath)
 	if err != nil {
-		return baseInfo, fmt.Errorf("read fail2ban conf of %s failed, err: %v", defaultFail2BanPath, err)
+		if baseInfo.IsActive {
+			return baseInfo, fmt.Errorf("read fail2ban conf of %s failed, err: %v", defaultFail2BanPath, err)
+		} else {
+			return baseInfo, nil
+		}
 	}
 	lines := strings.Split(string(conf), "\n")
 
diff --git a/frontend/src/views/toolbox/fail2ban/index.vue b/frontend/src/views/toolbox/fail2ban/index.vue
index 222246cb1..877bf3aaf 100644
--- a/frontend/src/views/toolbox/fail2ban/index.vue
+++ b/frontend/src/views/toolbox/fail2ban/index.vue
@@ -40,17 +40,14 @@
         </div>
 
         <div v-if="form.isExist">
-            <el-card v-if="!form.isActive" class="mask-prompt">
-                <span>{{ $t('toolbox.fail2ban.unActive') }}</span>
-            </el-card>
-            <LayoutContent title="Fail2ban" :divider="true" :class="{ mask: !form.isActive }">
+            <LayoutContent title="Fail2ban" :divider="true">
                 <template #toolbar>
                     <el-row>
                         <el-col :span="16">
-                            <el-button type="primary" plain @click="onLoadList('ignore')">
+                            <el-button :disabled="!form.isActive" type="primary" plain @click="onLoadList('ignore')">
                                 {{ $t('toolbox.fail2ban.ignoreIP') }}
                             </el-button>
-                            <el-button type="primary" plain @click="onLoadList('banned')">
+                            <el-button :disabled="!form.isActive" type="primary" plain @click="onLoadList('banned')">
                                 {{ $t('toolbox.fail2ban.bannedIP') }}
                             </el-button>
                         </el-col>