WAF允许ALLOW动作增加有效范围

web/public/js/components/server/http-firewall-actions-box.js

@@ -85,6 +85,8 @@ Vue.component("http-firewall-actions-box", {
 			ipListLevels: [],
 
 			// 动作参数
+			allowScope: "global",
+
 			blockTimeout: "",
 			blockTimeoutMax: "",
 			blockScope: "global",
@@ -140,6 +142,9 @@ Vue.component("http-firewall-actions-box", {
 			})
 			this.actionOptions = {}
 		},
+		allowScope: function (v) {
+			this.actionOptions["scope"] = v
+		},
 		blockTimeout: function (v) {
 			v = parseInt(v)
 			if (isNaN(v)) {
@@ -279,6 +284,8 @@ Vue.component("http-firewall-actions-box", {
 			this.actionOptions = {}
 
 			// 动作参数
+			this.allowScope = "global"
+
 			this.blockTimeout = ""
 			this.blockTimeoutMax = ""
 			this.blockScope = "global"
@@ -363,6 +370,11 @@ Vue.component("http-firewall-actions-box", {
 					}
 					break
 				case "allow":
+					if (config.options != null && config.options.scope != null && config.options.scope.length > 0) {
+						this.allowScope = config.options.scope
+					} else {
+						this.allowScope = "global"
+					}
 					break
 				case "log":
 					break
@@ -674,6 +686,13 @@ Vue.component("http-firewall-actions-box", {
 		<div v-for="(config, index) in configs" :data-index="index" :key="config.id" class="ui label small basic" :class="{blue: index == editingIndex}" style="margin-bottom: 0.4em">
 			{{config.name}} <span class="small">({{config.code.toUpperCase()}})</span> 
 			
+			<!-- allow -->
+			<span class="small" v-if="config.code == 'allow' && config.options != null && config.options.scope != null && config.options.scope.length > 0">
+				<span v-if="config.options.scope == 'group'">[分组]</span>
+				<span v-if="config.options.scope == 'server'">[网站]</span>
+				<span v-if="config.options.scope == 'global'">[网站和策略]</span>
+			</span>
+			
 			<!-- block -->
 			<span v-if="config.code == 'block' && config.options.timeout > 0">：封禁时长{{config.options.timeout}}<span v-if="config.options.timeoutMax > config.options.timeout">-{{config.options.timeoutMax}}</span>秒</span>
 			
@@ -712,7 +731,7 @@ Vue.component("http-firewall-actions-box", {
 			<span v-if="config.code == 'go_set'">：{{config.options.groupName}} / {{config.options.setName}}</span>
 			
 			<!-- 范围 -->
-			<span v-if="config.options.scope != null && config.options.scope.length > 0" class="small grey">
+			<span v-if="config.code != 'allow' && config.options.scope != null && config.options.scope.length > 0" class="small grey">
 				&nbsp; 
 				<span v-if="config.options.scope == 'global'">[所有网站]</span>
 				<span v-if="config.options.scope == 'service'">[当前网站]</span>
@@ -735,6 +754,21 @@ Vue.component("http-firewall-actions-box", {
 				</td>
 			</tr>
 			
+			<!-- allow -->
+			<tr v-if="actionCode == 'allow'">
+				<td>有效范围</td>
+				<td>
+					<select class="ui dropdown auto-width" v-model="allowScope">
+						<option value="group">分组</option>
+						<option value="server">网站</option>
+						<option value="global">网站和策略</option>
+					</select>
+					<p class="comment" v-if="allowScope == 'group'">跳过当前分组其他规则集，继续执行其他分组的规则集。</p>
+					<p class="comment" v-if="allowScope == 'server'">跳过当前网站所有的规则集。</p>
+					<p class="comment" v-if="allowScope =='global'">跳过当前网站和网站对应WAF策略所有的规则集。</p>
+				</td>
+			</tr>
+			
 			<!-- block -->
 			<tr v-if="actionCode == 'block'">
 				<td>封禁范围</td>

web/public/js/components/server/http-firewall-actions-view.js

@@ -6,6 +6,11 @@ Vue.component("http-firewall-actions-view", {
 			<span :class="{red: action.category == 'block', orange: action.category == 'verify', green: action.category == 'allow'}">{{action.name}} ({{action.code.toUpperCase()}})
 			  	<div v-if="action.options != null">
 			  		<span class="grey small" v-if="action.code.toLowerCase() == 'page'">[{{action.options.status}}]</span>
+			  		<span class="grey small" v-if="action.code.toLowerCase() == 'allow' && action.options != null && action.options.scope != null && action.options.scope.length > 0">
+			  			<span v-if="action.options.scope == 'group'">[分组]</span>
+						<span v-if="action.options.scope == 'server'">[网站]</span>
+						<span v-if="action.options.scope == 'global'">[网站和策略]</span>	
+					</span>
 				</div>	
 			</span>
 		</div>