集群WAF策略处于非防御模式时在地区封禁页面提示用户

internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go

@@ -42,6 +42,7 @@ func (this *CountriesAction) RunGet(params struct {
 		this.NotFound("firewallPolicy", params.FirewallPolicyId)
 		return
 	}
+
 	var deniedCountryIds = []int64{}
 	var allowedCountryIds = []int64{}
 	var countryHTML = ""
@@ -95,6 +96,24 @@ func (this *CountriesAction) RunGet(params struct {
 	}
 	this.Data["wafIsOn"] = webConfig.FirewallRef != nil && webConfig.FirewallRef.IsOn
 
+	// 获取当前服务所在集群的WAF设置
+	clusterFirewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if clusterFirewallPolicy != nil {
+		this.Data["clusterFirewallPolicy"] = maps.Map{
+			"id":       clusterFirewallPolicy.Id,
+			"name":     clusterFirewallPolicy.Name,
+			"isOn":     clusterFirewallPolicy.IsOn,
+			"mode":     clusterFirewallPolicy.Mode,
+			"modeInfo": firewallconfigs.FindFirewallMode(clusterFirewallPolicy.Mode),
+		}
+	} else {
+		this.Data["clusterFirewallPolicy"] = nil
+	}
+
 	this.Show()
 }
 

internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go

@@ -96,6 +96,24 @@ func (this *ProvincesAction) RunGet(params struct {
 	}
 	this.Data["wafIsOn"] = webConfig.FirewallRef != nil && webConfig.FirewallRef.IsOn
 
+	// 获取当前服务所在集群的WAF设置
+	clusterFirewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if clusterFirewallPolicy != nil {
+		this.Data["clusterFirewallPolicy"] = maps.Map{
+			"id":       clusterFirewallPolicy.Id,
+			"name":     clusterFirewallPolicy.Name,
+			"isOn":     clusterFirewallPolicy.IsOn,
+			"mode":     clusterFirewallPolicy.Mode,
+			"modeInfo": firewallconfigs.FindFirewallMode(clusterFirewallPolicy.Mode),
+		}
+	} else {
+		this.Data["clusterFirewallPolicy"] = nil
+	}
+
 	this.Show()
 }
 

web/views/@default/servers/server/settings/waf/ipadmin/countries.html

@@ -9,6 +9,10 @@
 
     {$ if .featureIsOn}
     <warning-message v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</warning-message>
+    <warning-message v-if="clusterFirewallPolicy != null && clusterFirewallPolicy.mode != 'defend'">当前网站所在集群的WAF策略模式为
+        <span v-if="clusterFirewallPolicy.modeInfo != null"><strong>{{clusterFirewallPolicy.modeInfo.name}}</strong></span>
+        <span v-else>非防御模式</span>，当前设置将不会生效。
+    </warning-message>
 
 	<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 		<input type="hidden" name="firewallPolicyId" :value="firewallPolicyId"/>

web/views/@default/servers/server/settings/waf/ipadmin/provinces.html

@@ -9,6 +9,10 @@
 
     {$ if .featureIsOn}
     <warning-message v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</warning-message>
+    <warning-message v-if="clusterFirewallPolicy != null && clusterFirewallPolicy.mode != 'defend'">当前网站所在集群的WAF策略模式为
+        <span v-if="clusterFirewallPolicy.modeInfo != null"><strong>{{clusterFirewallPolicy.modeInfo.name}}</strong></span>
+        <span v-else>非防御模式</span>，当前设置将不会生效。
+    </warning-message>
 
 	<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 		<input type="hidden" name="firewallPolicyId" :value="firewallPolicyId"/>