xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: domain-set wildcard match

Browse source
This commit is contained in:
Skyxim 2023-04-26 02:49:16 +00:00
parent e1af1abcc2
commit d8db25ee89
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
component/trie/domain_set.go
View file

@ -105,7 +105,7 @@ func (ss *DomainSet) Has(key string) bool {
} }
} }
for ; ; nextBmIdx++ { for ; ; nextBmIdx++ {
if ss.labels[nextBmIdx-nextNodeId] == domainStepByte { if nextBmIdx-nextNodeId < len(ss.labels) && ss.labels[nextBmIdx-nextNodeId] == domainStepByte {
bmIdx = nextBmIdx bmIdx = nextBmIdx
nodeId = nextNodeId nodeId = nextNodeId
i = j i = j

2
component/trie/domain_set_test.go
View file

@ -65,6 +65,7 @@ func TestDomainSetWildcard(t *testing.T) {
"stun.*.*", "stun.*.*",
"*.*.qq.com", "*.*.qq.com",
"test.*.baidu.com", "test.*.baidu.com",
"*.apple.com",
} }
for _, domain := range domainSet { for _, domain := range domainSet {
@ -78,6 +79,7 @@ func TestDomainSetWildcard(t *testing.T) {
assert.True(t, set.Has("stun.ab.cd")) assert.True(t, set.Has("stun.ab.cd"))
assert.False(t, set.Has("test.baidu.com")) assert.False(t, set.Has("test.baidu.com"))
assert.False(t, set.Has("www.google.com")) assert.False(t, set.Has("www.google.com"))
assert.False(t, set.Has("a.www.google.com"))
assert.False(t, set.Has("test.qq.com")) assert.False(t, set.Has("test.qq.com"))
assert.False(t, set.Has("test.test.test.qq.com")) assert.False(t, set.Has("test.test.test.qq.com"))
} }