TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-07 18:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

对WAF正则缓存增加命中率检查

Browse Source
This commit is contained in:
刘祥超
2023-10-12 20:10:30 +08:00
parent adb0069c59
commit 3aa68b5ffc
4 changed files with 309 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/waf/utils/utils.go
View File

@@ -1,14 +1,24 @@
package utils
import (
teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
"github.com/TeaOSLab/EdgeNode/internal/re"
"github.com/TeaOSLab/EdgeNode/internal/ttlcache"
"github.com/TeaOSLab/EdgeNode/internal/utils/cachehits"
"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
"github.com/cespare/xxhash"
"strconv"
)
var cache = ttlcache.NewCache[int8]()
var cacheHits *cachehits.Stat
func init() {
if !teaconst.IsMain {
return
}
cacheHits = cachehits.NewStat(5)
}
const (
maxCacheDataSize = 1024
@@ -29,15 +39,18 @@ func MatchStringCache(regex *re.Regexp, s string, cacheLife CacheLife) bool {
return false
}
var regIdString = regex.IdString()
// 如果长度超过一定数量，大概率是不能重用的
if cacheLife <= 0 || len(s) > maxCacheDataSize {
if cacheLife <= 0 || len(s) > maxCacheDataSize || !cacheHits.IsGood(regIdString) {
return regex.MatchString(s)
}
var hash = xxhash.Sum64String(s)
var key = regex.IdString() + "@" + strconv.FormatUint(hash, 10)
var key = regIdString + "@" + strconv.FormatUint(hash, 10)
var item = cache.Read(key)
if item != nil {
cacheHits.IncreaseHit(regIdString)
return item.Value == 1
}
var b = regex.MatchString(s)
@@ -46,6 +59,7 @@ func MatchStringCache(regex *re.Regexp, s string, cacheLife CacheLife) bool {
} else {
cache.Write(key, 0, fasttime.Now().Unix()+cacheLife)
}
cacheHits.IncreaseCached(regIdString)
return b
}
@@ -55,15 +69,18 @@ func MatchBytesCache(regex *re.Regexp, byteSlice []byte, cacheLife CacheLife) bo
return false
}
var regIdString = regex.IdString()
// 如果长度超过一定数量，大概率是不能重用的
if cacheLife <= 0 || len(byteSlice) > maxCacheDataSize {
if cacheLife <= 0 || len(byteSlice) > maxCacheDataSize || !cacheHits.IsGood(regIdString) {
return regex.Match(byteSlice)
}
var hash = xxhash.Sum64(byteSlice)
var key = regex.IdString() + "@" + strconv.FormatUint(hash, 10)
var key = regIdString + "@" + strconv.FormatUint(hash, 10)
var item = cache.Read(key)
if item != nil {
cacheHits.IncreaseHit(regIdString)
return item.Value == 1
}
if item != nil {
@@ -75,5 +92,6 @@ func MatchBytesCache(regex *re.Regexp, byteSlice []byte, cacheLife CacheLife) bo
} else {
cache.Write(key, 0, fasttime.Now().Unix()+cacheLife)
}
cacheHits.IncreaseCached(regIdString)
return b
}