From d01e34aa4092f832136ff9affd3623045cbe2e06 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Tue, 9 Jul 2024 11:35:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20UFW=20=20=E9=98=B2?=
 =?UTF-8?q?=E7=81=AB=E5=A2=99=E5=88=97=E8=A1=A8=E8=A7=A3=E6=9E=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20(#5724)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/utils/firewall/client/ufw.go           |  5 ++++-
 .../src/views/toolbox/clam/setting/index.vue   | 18 ++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/backend/utils/firewall/client/ufw.go b/backend/utils/firewall/client/ufw.go
index 678a9afa0..a43433263 100644
--- a/backend/utils/firewall/client/ufw.go
+++ b/backend/utils/firewall/client/ufw.go
@@ -223,7 +223,7 @@ func (f *Ufw) RichRules(rule FireInfo, operation string) error {
 
 	stdout, err := cmd.Exec(ruleStr)
 	if err != nil {
-		if strings.Contains(stdout, "ERROR: Invalid position") {
+		if strings.Contains(stdout, "ERROR: Invalid position") || strings.Contains(stdout, "ERROR: 无效位置") {
 			stdout, err := cmd.Exec(strings.ReplaceAll(ruleStr, "insert 1 ", ""))
 			if err != nil {
 				return fmt.Errorf("%s rich rules (%s), failed, err: %s", operation, ruleStr, stdout)
@@ -270,6 +270,9 @@ func (f *Ufw) loadInfo(line string, fireType string) FireInfo {
 			itemInfo.Strategy = "accept"
 		}
 		if fields[1] == "(v6)" {
+			if fields[2] == "ALLOW" {
+				itemInfo.Strategy = "accept"
+			}
 			itemInfo.Address = fields[4]
 		} else {
 			itemInfo.Address = fields[3]
diff --git a/frontend/src/views/toolbox/clam/setting/index.vue b/frontend/src/views/toolbox/clam/setting/index.vue
index bde2095f3..20905e3cb 100644
--- a/frontend/src/views/toolbox/clam/setting/index.vue
+++ b/frontend/src/views/toolbox/clam/setting/index.vue
@@ -29,12 +29,7 @@
 
             <template #main>
                 <div>
-                    <el-select
-                        v-if="!canUpdate()"
-                        style="width: 20%"
-                        @change="search(activeName)"
-                        v-model.number="tail"
-                    >
+                    <el-select v-if="!canUpdate()" style="width: 20%" @change="search()" v-model.number="tail">
                         <template #prefix>{{ $t('toolbox.clam.tail') }}</template>
                         <el-option :value="0" :label="$t('commons.table.all')" />
                         <el-option :value="10" :label="10" />
@@ -89,7 +84,7 @@ const handleReady = (payload) => {
 };
 
 const activeName = ref('clamd');
-const tail = ref(0);
+const tail = ref(200);
 const content = ref();
 const confirmRef = ref();
 
@@ -105,9 +100,12 @@ const canUpdate = () => {
     return activeName.value.indexOf('-log') === -1;
 };
 
-const search = async (itemName: string) => {
+const search = async (itemName?: string) => {
+    if (itemName) {
+        tail.value = itemName.indexOf('-log') === -1 ? 0 : 200;
+        activeName.value = itemName;
+    }
     loading.value = true;
-    activeName.value = itemName;
     await searchClamFile(activeName.value, tail.value + '')
         .then((res) => {
             loading.value = false;
@@ -140,7 +138,7 @@ const onSubmit = async () => {
         .then(() => {
             loading.value = false;
             MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
-            search(activeName.value);
+            search();
         })
         .catch(() => {
             loading.value = false;