From 2b9de7938fc5beaf7377bf363a3e4ea80792e45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Wed, 6 Oct 2021 09:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=9C=8D=E5=8A=A1=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=87=8C=E4=B9=9F=E6=98=BE=E7=A4=BAWAF=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/server/settings/locations/waf/index.go       | 9 ++++++---
 .../actions/default/servers/server/settings/waf/index.go | 9 ++++++---
 .../js/components/server/http-firewall-config-box.js     | 2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/internal/web/actions/default/servers/server/settings/locations/waf/index.go b/internal/web/actions/default/servers/server/settings/locations/waf/index.go
index ecc90b8c..9e3bf00d 100644
--- a/internal/web/actions/default/servers/server/settings/locations/waf/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/waf/index.go
@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -36,9 +37,11 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	if firewallPolicy != nil {
 		this.Data["firewallPolicy"] = maps.Map{
-			"id":   firewallPolicy.Id,
-			"name": firewallPolicy.Name,
-			"isOn": firewallPolicy.IsOn,
+			"id":       firewallPolicy.Id,
+			"name":     firewallPolicy.Name,
+			"isOn":     firewallPolicy.IsOn,
+			"mode":     firewallPolicy.Mode,
+			"modeInfo": firewallconfigs.FindFirewallMode(firewallPolicy.Mode),
 		}
 	} else {
 		this.Data["firewallPolicy"] = nil
diff --git a/internal/web/actions/default/servers/server/settings/waf/index.go b/internal/web/actions/default/servers/server/settings/waf/index.go
index 08c366fe..5bc09844 100644
--- a/internal/web/actions/default/servers/server/settings/waf/index.go
+++ b/internal/web/actions/default/servers/server/settings/waf/index.go
@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -37,9 +38,11 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	if firewallPolicy != nil {
 		this.Data["firewallPolicy"] = maps.Map{
-			"id":   firewallPolicy.Id,
-			"name": firewallPolicy.Name,
-			"isOn": firewallPolicy.IsOn,
+			"id":       firewallPolicy.Id,
+			"name":     firewallPolicy.Name,
+			"isOn":     firewallPolicy.IsOn,
+			"mode":     firewallPolicy.Mode,
+			"modeInfo": firewallconfigs.FindFirewallMode(firewallPolicy.Mode),
 		}
 	} else {
 		this.Data["firewallPolicy"] = nil
diff --git a/web/public/js/components/server/http-firewall-config-box.js b/web/public/js/components/server/http-firewall-config-box.js
index 7ba0a1e0..07a24931 100644
--- a/web/public/js/components/server/http-firewall-config-box.js
+++ b/web/public/js/components/server/http-firewall-config-box.js
@@ -22,7 +22,7 @@ Vue.component("http-firewall-config-box", {
 			<tr>
 				<td>WAF策略</td>
 				<td>
-					<div v-if="vFirewallPolicy != null">{{vFirewallPolicy.name}} <link-icon :href="'/servers/components/waf/policy?firewallPolicyId=' + vFirewallPolicy.id"></link-icon>
+					<div v-if="vFirewallPolicy != null">{{vFirewallPolicy.name}} <span v-if="vFirewallPolicy.modeInfo != null">&nbsp; <span :class="{green: vFirewallPolicy.modeInfo.code == 'defend', blue: vFirewallPolicy.modeInfo.code == 'observe', grey: vFirewallPolicy.modeInfo.code == 'pass'}">[{{vFirewallPolicy.modeInfo.name}}]</span>&nbsp;</span> <link-icon :href="'/servers/components/waf/policy?firewallPolicyId=' + vFirewallPolicy.id"></link-icon>
 						<p class="comment">使用当前服务所在集群的设置。</p>
 					</div>
 					<span v-else class="red">当前集群没有设置WAF策略，当前配置无法生效。</span>