TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-03 23:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

访问日志增加IPv6范围搜索

Browse Source
This commit is contained in:
GoEdgeLab
2024-05-03 16:58:38 +08:00
parent cf66887d48
commit 75fc3f3ce7
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/db/models/http_access_log_dao.go
View File

@@ -520,14 +520,27 @@ func (this *HTTPAccessLogDAO) listAccessLogs(tx *dbs.Tx,
// keyword // keyword
if len(ip) > 0 { if len(ip) > 0 {
// TODO 支持IPv6范围
if tableQuery.hasRemoteAddrField { if tableQuery.hasRemoteAddrField {
// IP格式 // IP格式
if strings.Contains(ip, ",") || strings.Contains(ip, "-") { if strings.Contains(ip, ",") || strings.Contains(ip, "-") {
rangeConfig, err := shared.ParseIPRange(ip) rangeConfig, parseErr := shared.ParseIPRange(ip)
if err == nil { if parseErr == nil {
if len(rangeConfig.IPFrom) > 0 && len(rangeConfig.IPTo) > 0 { if len(rangeConfig.IPFrom) > 0 && len(rangeConfig.IPTo) > 0 {
query.Between("INET_ATON(remoteAddr)", iputils.ToLong(rangeConfig.IPFrom), iputils.ToLong(rangeConfig.IPTo)) if iputils.IsIPv6(rangeConfig.IPFrom) || iputils.IsIPv6(rangeConfig.IPTo) {
var ipFromHex = iputils.ToHex(rangeConfig.IPFrom)
var ipToHex = iputils.ToHex(rangeConfig.IPTo)
if ipFromHex > ipToHex {
ipFromHex, ipToHex = ipToHex, ipFromHex
}
query.Between("HEX(INET6_ATON(remoteAddr))", ipFromHex, ipToHex)
} else {
var ipFromLong = iputils.ToLong(rangeConfig.IPFrom)
var ipToLong = iputils.ToLong(rangeConfig.IPTo)
if ipFromLong > ipToLong {
ipFromLong, ipToLong = ipToLong, ipFromLong
}
query.Between("INET_ATON(remoteAddr)", ipFromLong, ipToLong)
}
} }
} }
} else { } else {