diff --git a/internal/web/actions/default/servers/logs/index.go b/internal/web/actions/default/servers/logs/index.go index 653be14d..acee5c91 100644 --- a/internal/web/actions/default/servers/logs/index.go +++ b/internal/web/actions/default/servers/logs/index.go @@ -25,6 +25,7 @@ func (this *IndexAction) RunGet(params struct { Ip string Domain string HasError int + HasWAF int RequestId string ServerId int64 @@ -41,6 +42,7 @@ func (this *IndexAction) 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{} @@ -52,14 +54,15 @@ func (this *IndexAction) 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) @@ -87,15 +90,16 @@ func (this *IndexAction) 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/web/public/js/components/server/http-access-log-search-box.js b/web/public/js/components/server/http-access-log-search-box.js index 95da17ed..dc0f668c 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 @@ -23,25 +23,59 @@ Vue.component("http-access-log-search-box", { keyword: keyword } }, + methods: { + cleanIP: function () { + this.ip = "" + this.submit() + }, + cleanDomain: function () { + this.domain = "" + this.submit() + }, + cleanKeyword: function () { + this.keyword = "" + this.submit() + }, + submit: function () { + let parent = this.$el.parentNode + while (true) { + if (parent == null) { + break + } + if (parent.tagName == "FORM") { + break + } + parent = parent.parentNode + } + if (parent != null) { + setTimeout(function () { + parent.submit() + }, 500) + } + } + }, template: `
-
+
IP +
-
+
域名 +
-
+
关键词 +
diff --git a/web/views/@default/dashboard/boards/waf.css b/web/views/@default/dashboard/boards/waf.css index 896d8fc2..1316b4d8 100644 --- a/web/views/@default/dashboard/boards/waf.css +++ b/web/views/@default/dashboard/boards/waf.css @@ -34,4 +34,8 @@ font-size: 0.8em; padding: 4px; } +h4.header a { + font-size: 0.85em; + float: right; +} /*# sourceMappingURL=waf.css.map */ \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/waf.css.map b/web/views/@default/dashboard/boards/waf.css.map index a341a494..e890688a 100644 --- a/web/views/@default/dashboard/boards/waf.css.map +++ b/web/views/@default/dashboard/boards/waf.css.map @@ -1 +1 @@ -{"version":3,"sources":["waf.less"],"names":[],"mappings":"AAAA,GAAG,QACF;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAIF;EACC,0BAAA;EACA,2BAAA;;AAFD,KAIC;EACC,kBAAA;EACA,4BAAA;;AANF,KAIC,QAIC,IAAG;EACF,iBAAA;;AATH,KAIC,QAIC,IAAG,MAGF;EACC,cAAA;EACA,mBAAA;;AAbJ,KAkBC,QAAO;EACN,eAAA;;AAnBF,KAsBC,GACC;EACC,aAAA;;AAxBH,KA4BC,QAAO,MACN;EACC,eAAA;;AAKH;EACC,YAAA;;AAGD;EACC,gBAAA;EACA,YAAA","file":"waf.css"} \ No newline at end of file +{"version":3,"sources":["waf.less"],"names":[],"mappings":"AAAA,GAAG,QACF;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAIF;EACC,0BAAA;EACA,2BAAA;;AAFD,KAIC;EACC,kBAAA;EACA,4BAAA;;AANF,KAIC,QAIC,IAAG;EACF,iBAAA;;AATH,KAIC,QAIC,IAAG,MAGF;EACC,cAAA;EACA,mBAAA;;AAbJ,KAkBC,QAAO;EACN,eAAA;;AAnBF,KAsBC,GACC;EACC,aAAA;;AAxBH,KA4BC,QAAO,MACN;EACC,eAAA;;AAKH;EACC,YAAA;;AAGD;EACC,gBAAA;EACA,YAAA;;AAGD,EAAE,OACD;EACC,iBAAA;EACA,YAAA","file":"waf.css"} \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/waf.html b/web/views/@default/dashboard/boards/waf.html index a24a37ad..104ddcf1 100644 --- a/web/views/@default/dashboard/boards/waf.html +++ b/web/views/@default/dashboard/boards/waf.html @@ -27,7 +27,7 @@
-

最新拦截记录

+

最新拦截记录 更多 »

diff --git a/web/views/@default/dashboard/boards/waf.less b/web/views/@default/dashboard/boards/waf.less index f5151713..e75e7192 100644 --- a/web/views/@default/dashboard/boards/waf.less +++ b/web/views/@default/dashboard/boards/waf.less @@ -48,4 +48,11 @@ .color-span { font-size: 0.8em; padding: 4px; +} + +h4.header { + a { + font-size: 0.85em; + float: right; + } } \ No newline at end of file diff --git a/web/views/@default/servers/logs/index.html b/web/views/@default/servers/logs/index.html index 41dc5cc5..bca0de58 100644 --- a/web/views/@default/servers/logs/index.html +++ b/web/views/@default/servers/logs/index.html @@ -2,13 +2,15 @@ {$template "/datepicker"} - 所有日志 + 所有日志 错误日志 + WAF日志 - + +
@@ -26,9 +28,9 @@
- 上一页 + 上一页 上一页   |   - 下一页 + 下一页 下一页
\ No newline at end of file