From 71a424ab68de5d7f51d7b39697a2ddb9bd6f560e Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Fri, 14 Jan 2022 10:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=9C=A8IP=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E3=80=81=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97=E4=B8=AD=E8=B7=B3?=
 =?UTF-8?q?=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84WAF=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/servers/server/log/viewPopup.go    |  5 +++--
 web/public/js/components/iplist/ip-list-table.js       | 10 +++++-----
 web/views/@default/servers/components/waf/group.html   |  4 ++--
 web/views/@default/servers/server/log/viewPopup.html   |  4 +++-
 .../@default/servers/server/settings/waf/group.html    |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/internal/web/actions/default/servers/server/log/viewPopup.go b/internal/web/actions/default/servers/server/log/viewPopup.go
index 397eb628..1b2ec2e7 100644
--- a/internal/web/actions/default/servers/server/log/viewPopup.go
+++ b/internal/web/actions/default/servers/server/log/viewPopup.go
@@ -48,8 +48,9 @@ func (this *ViewPopupAction) RunGet(params struct {
 		if policyResp.HttpFirewallPolicy != nil {
 			wafMap = maps.Map{
 				"policy": maps.Map{
-					"id":   policyResp.HttpFirewallPolicy.Id,
-					"name": policyResp.HttpFirewallPolicy.Name,
+					"id":       policyResp.HttpFirewallPolicy.Id,
+					"name":     policyResp.HttpFirewallPolicy.Name,
+					"serverId": policyResp.HttpFirewallPolicy.ServerId,
 				},
 			}
 			if accessLog.FirewallRuleGroupId > 0 {
diff --git a/web/public/js/components/iplist/ip-list-table.js b/web/public/js/components/iplist/ip-list-table.js
index 0c757c51..ed6c04d1 100644
--- a/web/public/js/components/iplist/ip-list-table.js
+++ b/web/public/js/components/iplist/ip-list-table.js
@@ -165,15 +165,15 @@ Vue.component("ip-list-table", {
 					<span v-if="item.reason.length > 0">{{item.reason}}</span>
 					<span v-else class="disabled">-</span>
 					
+					<div v-if="item.sourceNode != null && item.sourceNode.id > 0" style="margin-top: 0.4em">
+						<a :href="'/clusters/cluster/node?clusterId=' + item.sourceNode.clusterId + '&nodeId=' + item.sourceNode.id"><span class="small"><i class="icon cloud"></i>{{item.sourceNode.name}}</span></a>
+					</div>
 					<div style="margin-top: 0.4em" v-if="item.sourceServer != null && item.sourceServer.id > 0">
 						<a :href="'/servers/server?serverId=' + item.sourceServer.id" style="border: 0"><span class="small "><i class="icon clone outline"></i>{{item.sourceServer.name}}</span></a>
 					</div>
 					<div v-if="item.sourcePolicy != null && item.sourcePolicy.id > 0" style="margin-top: 0.4em">
-						<a :href="'/servers/components/waf/group?firewallPolicyId=' +  item.sourcePolicy.id + '&type=inbound&groupId=' + item.sourceGroup.id" v-if="item.sourcePolicy.serverId == 0"><span class="small "><i class="icon shield"></i>{{item.sourcePolicy.name}} &raquo; {{item.sourceGroup.name}} &raquo; {{item.sourceSet.name}}</span></a>
-						<a :href="'/servers/server/settings/waf/group?serverId=' + item.sourcePolicy.serverId + '&firewallPolicyId=' + item.sourcePolicy.id + '&type=inbound&groupId=' + item.sourceGroup.id" v-if="item.sourcePolicy.serverId > 0"><span class="small "><i class="icon shield"></i> {{item.sourcePolicy.name}} &raquo; {{item.sourceGroup.name}} &raquo; {{item.sourceSet.name}}</span></a>
-					</div>
-					<div v-if="item.sourceNode != null && item.sourceNode.id > 0" style="margin-top: 0.4em">
-						<a :href="'/clusters/cluster/node?clusterId=' + item.sourceNode.clusterId + '&nodeId=' + item.sourceNode.id"><span class="small"><i class="icon cloud"></i>{{item.sourceNode.name}}</span></a>
+						<a :href="'/servers/components/waf/group?firewallPolicyId=' +  item.sourcePolicy.id + '&type=inbound&groupId=' + item.sourceGroup.id + '#set' + item.sourceSet.id" v-if="item.sourcePolicy.serverId == 0"><span class="small "><i class="icon shield"></i>{{item.sourcePolicy.name}} &raquo; {{item.sourceGroup.name}} &raquo; {{item.sourceSet.name}}</span></a>
+						<a :href="'/servers/server/settings/waf/group?serverId=' + item.sourcePolicy.serverId + '&firewallPolicyId=' + item.sourcePolicy.id + '&type=inbound&groupId=' + item.sourceGroup.id + '#set' + item.sourceSet.id" v-if="item.sourcePolicy.serverId > 0"><span class="small "><i class="icon shield"></i> {{item.sourcePolicy.name}} &raquo; {{item.sourceGroup.name}} &raquo; {{item.sourceSet.name}}</span></a>
 					</div>
 				</td>
 				<td>
diff --git a/web/views/@default/servers/components/waf/group.html b/web/views/@default/servers/components/waf/group.html
index b66e6733..aba120f9 100644
--- a/web/views/@default/servers/components/waf/group.html
+++ b/web/views/@default/servers/components/waf/group.html
@@ -45,8 +45,8 @@
 		</thead>
 		<tbody v-for="set in sets" :data-set-id="set.id">
 		<tr>
-			<td style="text-align: center;"><i class="icon bars handle grey"></i> </td>
-			<td nowrap=""><a href="" @click.prevent="updateSet(set.id)"><span :class="{disabled:!set.isOn}">{{set.name}}</span> <i class="icon clone outline small"></i> </a>
+			<td style="text-align: center;"><i class="icon bars handle grey"></i></td>
+			<td nowrap=""><a :name="'set' + set.id"></a><a href="" @click.prevent="updateSet(set.id)"><span :class="{disabled:!set.isOn}">{{set.name}}</span> <i class="icon clone outline small"></i> </a>
 				<p style="margin-top:0.5em">
 					<label-on :v-is-on="set.isOn"></label-on>
 				</p>
diff --git a/web/views/@default/servers/server/log/viewPopup.html b/web/views/@default/servers/server/log/viewPopup.html
index 3a554022..87e3d5d7 100644
--- a/web/views/@default/servers/server/log/viewPopup.html
+++ b/web/views/@default/servers/server/log/viewPopup.html
@@ -56,7 +56,9 @@
 			</td>
 		</tr>
 		<tr v-if="wafInfo != null && wafInfo.set != null">
-			<td class="color-border">WAF规则集：{{wafInfo.set.name}}</td>
+			<td class="color-border">WAF规则集：
+                <a :href="'/servers/components/waf/group?firewallPolicyId=' +  accessLog.firewallPolicyId + '&type=inbound&groupId=' + accessLog.firewallRuleGroupId+ '#set' + accessLog.firewallRuleSetId" v-if="wafInfo.policy.serverId == 0" target="_parent">{{wafInfo.set.name}}</a>
+                <a :href="'/servers/server/settings/waf/group?serverId=' + accessLog.serverId + '&firewallPolicyId=' + accessLog.firewallPolicyId + '&type=inbound&groupId=' + accessLog.firewallRuleGroupId + '#set' + accessLog.firewallRuleSetId" target="_parent" v-if="wafInfo.policy.serverId > 0">{{wafInfo.set.name}}</a> </td>
 			<td></td>
 		</tr>
 		<tr v-if="accessLog.errors != null && accessLog.errors.length > 0">
diff --git a/web/views/@default/servers/server/settings/waf/group.html b/web/views/@default/servers/server/settings/waf/group.html
index 8ca3e339..2a021edd 100644
--- a/web/views/@default/servers/server/settings/waf/group.html
+++ b/web/views/@default/servers/server/settings/waf/group.html
@@ -42,7 +42,7 @@
 		<tbody v-for="set in sets" :data-set-id="set.id">
 		<tr>
 			<td style="text-align: center;"><i class="icon bars handle grey"></i> </td>
-            <td nowrap=""><a href="" @click.prevent="updateSet(set.id)"><span :class="{disabled:!set.isOn}">{{set.name}}</span> <i class="icon clone outline small"></i></a>
+            <td nowrap=""><a :name="'set' + set.id"></a><a href="" @click.prevent="updateSet(set.id)"><span :class="{disabled:!set.isOn}">{{set.name}}</span> <i class="icon clone outline small"></i></a>
 				<p style="margin-top:0.5em">
 					<label-on :v-is-on="set.isOn"></label-on>
 				</p>