TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-09 16:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

WAF策略日志也加入地域信息

Browse Source
This commit is contained in:
刘祥超
2021-01-20 14:19:10 +08:00
parent 0bb379e4cc
commit fc68167f77
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/web/actions/default/servers/components/waf/log.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/maps"
timeutil "github.com/iwind/TeaGo/utils/time" timeutil "github.com/iwind/TeaGo/utils/time"
"regexp" "regexp"
@@ -35,6 +36,7 @@ func (this *LogAction) RunGet(params struct {
this.Data["accessLogs"] = []interface{}{} this.Data["accessLogs"] = []interface{}{}
day := params.Day day := params.Day
ipList := []string{}
if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) { if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) {
day = strings.ReplaceAll(day, "-", "") day = strings.ReplaceAll(day, "-", "")
size := int64(10) size := int64(10)
@@ -55,6 +57,13 @@ func (this *LogAction) RunGet(params struct {
this.Data["accessLogs"] = []interface{}{} this.Data["accessLogs"] = []interface{}{}
} else { } else {
this.Data["accessLogs"] = resp.AccessLogs this.Data["accessLogs"] = resp.AccessLogs
for _, accessLog := range resp.AccessLogs {
if len(accessLog.RemoteAddr) > 0 {
if !lists.ContainsString(ipList, accessLog.RemoteAddr) {
ipList = append(ipList, accessLog.RemoteAddr)
}
}
}
} }
this.Data["hasMore"] = resp.HasMore this.Data["hasMore"] = resp.HasMore
this.Data["nextRequestId"] = resp.RequestId this.Data["nextRequestId"] = resp.RequestId
@@ -106,5 +115,21 @@ func (this *LogAction) RunGet(params struct {
} }
this.Data["groups"] = groupMaps this.Data["groups"] = groupMaps
// 根据IP查询区域
regionMap := map[string]string{} // ip => region
if len(ipList) > 0 {
resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
if err != nil {
this.ErrorPage(err)
return
}
if resp.IpRegionMap != nil {
for ip, region := range resp.IpRegionMap {
regionMap[ip] = region.Summary
}
}
}
this.Data["regions"] = regionMap
this.Show() this.Show()
} }

9
web/views/@default/servers/components/waf/log.js
View File

@@ -5,4 +5,13 @@ Tea.context(function () {
that.day = day that.day = day
}) })
}) })
let that = this
this.accessLogs.forEach(function (accessLog) {
if (typeof (that.regions[accessLog.remoteAddr]) == "string") {
accessLog.region = that.regions[accessLog.remoteAddr]
} else {
accessLog.region = ""
}
})
}) })