ChenKaiLiuG/GoEdgeNode
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

优化测试用例

Browse Source
This commit is contained in:
刘祥超
2024-01-21 11:13:30 +08:00
parent 095c381ae5
commit d84b844e53
35 changed files with 439 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/waf/ip_list_test.go
View File

@@ -4,6 +4,7 @@ package waf_test
import (
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"github.com/TeaOSLab/EdgeNode/internal/waf"
"github.com/iwind/TeaGo/Tea"
"github.com/iwind/TeaGo/assert"
@@ -32,6 +33,10 @@ func TestNewIPList(t *testing.T) {
}
func TestIPList_Expire(t *testing.T) {
if !testutils.IsSingleTesting() {
return
}
var list = waf.NewIPList(waf.IPListTypeDeny)
list.Add(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "127.0.0.1", time.Now().Unix())
list.Add(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "127.0.0.2", time.Now().Unix()+1)

6
internal/waf/rule_test.go
View File

@@ -695,7 +695,7 @@ func TestRule_IP(t *testing.T) {
Value: "192.168.0.90,",
}
a.IsNil(rule.Init())
a.IsTrue(rule.Test("192.168.0.100"))
a.IsFalse(rule.Test("192.168.0.100"))
}
{
@@ -708,7 +708,7 @@ func TestRule_IP(t *testing.T) {
}
{
rule := Rule{
var rule = Rule{
Operator: RuleOperatorIPRange,
Value: ",192.168.1.100",
}
@@ -748,7 +748,7 @@ func TestRule_IP(t *testing.T) {
Operator: RuleOperatorIPRange,
Value: "a/18",
}
a.IsNotNil(rule.Init())
a.IsNil(rule.Init())
a.IsFalse(rule.Test("192.168.1.100"))
}

6
internal/waf/values/ip_range.go
View File

@@ -67,7 +67,11 @@ func ParseIPRangeList(value string) *IPRangeList {
if strings.Contains(line, ",") { // IPFrom,IPTo
var pieces = strings.SplitN(line, ",", 2)
if len(pieces) == 2 {
var ipFrom = net.ParseIP(strings.TrimSpace(pieces[0]))
var ipFromString = strings.TrimSpace(pieces[0])
if len(ipFromString) == 0 {
ipFromString = "0.0.0.0"
}
var ipFrom = net.ParseIP(ipFromString)
var ipTo = net.ParseIP(strings.TrimSpace(pieces[1]))
if ipFrom != nil && ipTo != nil {
if bytes.Compare(ipFrom, ipTo) > 0 {