From 769223a1009dbea02c539e46922ad9be521c6925 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 22 Aug 2021 16:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=9C=8D=E5=8A=A1=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0WAF=E6=97=A5=E5=BF=97=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/server/log/history.go     | 38 ++++++++++---------
 .../default/servers/server/log/today.go       | 38 ++++++++++---------
 .../server/http-access-log-search-box.js      |  4 +-
 .../@default/servers/server/log/history.html  | 10 +++--
 .../@default/servers/server/log/today.html    | 10 +++--
 5 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/internal/web/actions/default/servers/server/log/history.go b/internal/web/actions/default/servers/server/log/history.go
index 06e641f7..9cd5d5cc 100644
--- a/internal/web/actions/default/servers/server/log/history.go
+++ b/internal/web/actions/default/servers/server/log/history.go
@@ -24,6 +24,7 @@ func (this *HistoryAction) RunGet(params struct {
 	Keyword  string
 	Ip       string
 	Domain   string
+	HasWAF   int
 
 	RequestId string
 	HasError  int
@@ -39,6 +40,7 @@ func (this *HistoryAction) RunGet(params struct {
 	this.Data["domain"] = params.Domain
 	this.Data["accessLogs"] = []interface{}{}
 	this.Data["hasError"] = params.HasError
+	this.Data["hasWAF"] = params.HasWAF
 
 	day := params.Day
 	ipList := []string{}
@@ -50,14 +52,15 @@ func (this *HistoryAction) RunGet(params struct {
 		this.Data["hasError"] = params.HasError
 
 		resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
-			RequestId: params.RequestId,
-			ServerId:  params.ServerId,
-			HasError:  params.HasError > 0,
-			Day:       day,
-			Keyword:   params.Keyword,
-			Ip:        params.Ip,
-			Domain:    params.Domain,
-			Size:      size,
+			RequestId:         params.RequestId,
+			ServerId:          params.ServerId,
+			HasError:          params.HasError > 0,
+			HasFirewallPolicy: params.HasWAF > 0,
+			Day:               day,
+			Keyword:           params.Keyword,
+			Ip:                params.Ip,
+			Domain:            params.Domain,
+			Size:              size,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -85,15 +88,16 @@ func (this *HistoryAction) RunGet(params struct {
 		if len(params.RequestId) > 0 {
 			this.Data["hasPrev"] = true
 			prevResp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
-				RequestId: params.RequestId,
-				ServerId:  params.ServerId,
-				HasError:  params.HasError > 0,
-				Day:       day,
-				Keyword:   params.Keyword,
-				Ip:        params.Ip,
-				Domain:    params.Domain,
-				Size:      size,
-				Reverse:   true,
+				RequestId:         params.RequestId,
+				ServerId:          params.ServerId,
+				HasError:          params.HasError > 0,
+				HasFirewallPolicy: params.HasWAF > 0,
+				Day:               day,
+				Keyword:           params.Keyword,
+				Ip:                params.Ip,
+				Domain:            params.Domain,
+				Size:              size,
+				Reverse:           true,
 			})
 			if err != nil {
 				this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/server/log/today.go b/internal/web/actions/default/servers/server/log/today.go
index 8597db2d..e9e8a68f 100644
--- a/internal/web/actions/default/servers/server/log/today.go
+++ b/internal/web/actions/default/servers/server/log/today.go
@@ -20,6 +20,7 @@ func (this *TodayAction) RunGet(params struct {
 	RequestId string
 	ServerId  int64
 	HasError  int
+	HasWAF    int
 	Keyword   string
 	Ip        string
 	Domain    string
@@ -31,16 +32,18 @@ func (this *TodayAction) RunGet(params struct {
 	this.Data["keyword"] = params.Keyword
 	this.Data["ip"] = params.Ip
 	this.Data["domain"] = params.Domain
+	this.Data["hasWAF"] = params.HasWAF
 
 	resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
-		RequestId: params.RequestId,
-		ServerId:  params.ServerId,
-		HasError:  params.HasError > 0,
-		Day:       timeutil.Format("Ymd"),
-		Keyword:   params.Keyword,
-		Ip:        params.Ip,
-		Domain:    params.Domain,
-		Size:      size,
+		RequestId:         params.RequestId,
+		ServerId:          params.ServerId,
+		HasError:          params.HasError > 0,
+		HasFirewallPolicy: params.HasWAF > 0,
+		Day:               timeutil.Format("Ymd"),
+		Keyword:           params.Keyword,
+		Ip:                params.Ip,
+		Domain:            params.Domain,
+		Size:              size,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -69,15 +72,16 @@ func (this *TodayAction) RunGet(params struct {
 	if len(params.RequestId) > 0 {
 		this.Data["hasPrev"] = true
 		prevResp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
-			RequestId: params.RequestId,
-			ServerId:  params.ServerId,
-			HasError:  params.HasError > 0,
-			Day:       timeutil.Format("Ymd"),
-			Keyword:   params.Keyword,
-			Ip:        params.Ip,
-			Domain:    params.Domain,
-			Size:      size,
-			Reverse:   true,
+			RequestId:         params.RequestId,
+			ServerId:          params.ServerId,
+			HasError:          params.HasError > 0,
+			HasFirewallPolicy: params.HasWAF > 0,
+			Day:               timeutil.Format("Ymd"),
+			Keyword:           params.Keyword,
+			Ip:                params.Ip,
+			Domain:            params.Domain,
+			Size:              size,
+			Reverse:           true,
 		})
 		if err != nil {
 			this.ErrorPage(err)
diff --git a/web/public/js/components/server/http-access-log-search-box.js b/web/public/js/components/server/http-access-log-search-box.js
index dc0f668c..35a3be1e 100644
--- a/web/public/js/components/server/http-access-log-search-box.js
+++ b/web/public/js/components/server/http-access-log-search-box.js
@@ -65,14 +65,14 @@ Vue.component("http-access-log-search-box", {
 			</div>
 		</div>
 		<div class="ui field">
-			<div class="ui input left labeled small" :class="{'right labeled': domain.length > 0}">
+			<div class="ui input left right labeled small" >
 				<span class="ui label basic" style="font-weight: normal">域名</span>
 				<input type="text" name="domain" placeholder="xxx.com" size="15" v-model="domain"/>
 				<a class="ui label basic" :class="{disabled: domain.length == 0}" @click.prevent="cleanDomain"><i class="icon remove small"></i></a>
 			</div>
 		</div>
 		<div class="ui field">
-			<div class="ui input left labeled small" :class="{'right labeled': keyword.length > 0}">
+			<div class="ui input left right labeled small">
 				<span class="ui label basic" style="font-weight: normal">关键词</span>
 				<input type="text" name="keyword" v-model="keyword" placeholder="路径、UserAgent等..." size="18"/>
 				<a class="ui label basic" :class="{disabled: keyword.length == 0}" @click.prevent="cleanKeyword"><i class="icon remove small"></i></a>
diff --git a/web/views/@default/servers/server/log/history.html b/web/views/@default/servers/server/log/history.html
index 65fb6248..6ad4613c 100644
--- a/web/views/@default/servers/server/log/history.html
+++ b/web/views/@default/servers/server/log/history.html
@@ -5,13 +5,15 @@
 
 <div class="right-box">
 	<first-menu>
-		<menu-item :href="path + '?serverId=' + serverId + '&day=' + day + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" :active="hasError == 0">所有日志</menu-item>
+		<menu-item :href="path + '?serverId=' + serverId + '&day=' + day + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" :active="hasError == 0 && hasWAF == 0">所有日志</menu-item>
 		<menu-item :href="path + '?serverId=' + serverId + '&day=' + day + '&hasError=1' + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" :active="hasError > 0">错误日志</menu-item>
+        <menu-item :href="path + '?serverId=' + serverId + '&day=' + day + '&hasWAF=1' + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" :active="hasWAF > 0">WAF日志</menu-item>
 	</first-menu>
 
-    <form method="get" class="ui form small" :action="path" autocomplete="off">
+    <form method="get" class="ui form small" :action="path">
         <input type="hidden" name="serverId" :value="serverId"/>
         <input type="hidden" name="hasError" :value="hasError"/>
+        <input type="hidden" name="hasWAF" :value="hasWAF"/>
         <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword">
             <div class="ui field">
                 <input type="text" name="day" maxlength="10" placeholder="选择日期" style="width:7.8em" id="day-input" v-model="day"/>
@@ -29,10 +31,10 @@
 	</table>
 
 	<div v-if="accessLogs.length > 0">
-		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&day=' + day + '&hasError=' + hasError + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" v-if="hasPrev">上一页</a>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&day=' + day + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" v-if="hasPrev">上一页</a>
 		<span v-else class="disabled">上一页</span>
 		<span class="disabled">&nbsp; | &nbsp;</span>
-		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&day=' + day + '&hasError=' + hasError + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" v-if="hasMore">下一页</a>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&day=' + day + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" v-if="hasMore">下一页</a>
 		<span v-else class="disabled">下一页</span>
 	</div>
 </div>
\ No newline at end of file
diff --git a/web/views/@default/servers/server/log/today.html b/web/views/@default/servers/server/log/today.html
index a8f7657b..d4b84e24 100644
--- a/web/views/@default/servers/server/log/today.html
+++ b/web/views/@default/servers/server/log/today.html
@@ -3,13 +3,15 @@
 {$template "/left_menu"}
 <div class="right-box">
 	<first-menu>
-		<menu-item :href="path + '?serverId=' + serverId + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" :active="hasError == 0">所有日志</menu-item>
+		<menu-item :href="path + '?serverId=' + serverId + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" :active="hasError == 0 && hasWAF == 0">所有日志</menu-item>
 		<menu-item :href="path + '?serverId=' + serverId + '&hasError=1' + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" :active="hasError > 0">错误日志</menu-item>
+        <menu-item :href="path + '?serverId=' + serverId + '&hasWAF=1' + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" :active="hasWAF > 0">WAF日志</menu-item>
 	</first-menu>
 
-    <form method="get" class="ui form small" :action="path" autocomplete="off">
+    <form method="get" class="ui form small" :action="path">
         <input type="hidden" name="serverId" :value="serverId"/>
         <input type="hidden" name="hasError" :value="hasError"/>
+        <input type="hidden" name="hasWAF" :value="hasWAF"/>
         <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword"></http-access-log-search-box>
     </form>
 
@@ -23,10 +25,10 @@
 	</table>
 
 	<div v-if="accessLogs.length > 0">
-		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&hasError=' + hasError + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" v-if="hasPrev">上一页</a>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" v-if="hasPrev">上一页</a>
 		<span v-else class="disabled">上一页</span>
 		<span class="disabled">&nbsp; | &nbsp;</span>
-		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&hasError=' + hasError + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" v-if="hasMore">下一页</a>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain" v-if="hasMore">下一页</a>
 		<span v-else class="disabled">下一页</span>
 	</div>
 </div>
\ No newline at end of file