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

Fix: domain wildcard behavior

Browse source
This commit is contained in:
gVisor bot 2020-04-24 23:49:19 +08:00
parent 496bfdf3f9
commit d622a93645
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
component/domain-trie/tire.go
View file

@ -81,6 +81,7 @@ func (t *Trie) Search(domain string) *Node {
n := t.root n := t.root
var dotWildcardNode *Node var dotWildcardNode *Node
var wildcardNode *Node
for i := len(parts) - 1; i >= 0; i-- { for i := len(parts) - 1; i >= 0; i-- {
part := parts[i] part := parts[i]
@ -88,10 +89,16 @@ func (t *Trie) Search(domain string) *Node {
dotWildcardNode = node dotWildcardNode = node
} }
if n.hasChild(part) { child := n.getChild(part)
n = n.getChild(part) if child == nil && wildcardNode != nil {
} else { child = wildcardNode.getChild(part)
n = n.getChild(wildcard) }
wildcardNode = n.getChild(wildcard)
n = child
if n == nil {
n = wildcardNode
wildcardNode = nil
} }
if n == nil { if n == nil {

2
component/domain-trie/trie_test.go
View file

@ -34,6 +34,7 @@ func TestTrie_Wildcard(t *testing.T) {
"*.dev", "*.dev",
".org", ".org",
".example.net", ".example.net",
".apple.*",
} }
for _, domain := range domains { for _, domain := range domains {
@ -44,6 +45,7 @@ func TestTrie_Wildcard(t *testing.T) {
assert.NotNil(t, tree.Search("sub.foo.example.com")) assert.NotNil(t, tree.Search("sub.foo.example.com"))
assert.NotNil(t, tree.Search("test.org")) assert.NotNil(t, tree.Search("test.org"))
assert.NotNil(t, tree.Search("test.example.net")) assert.NotNil(t, tree.Search("test.example.net"))
assert.NotNil(t, tree.Search("test.apple.com"))
assert.Nil(t, tree.Search("foo.sub.example.com")) assert.Nil(t, tree.Search("foo.sub.example.com"))
assert.Nil(t, tree.Search("foo.example.dev")) assert.Nil(t, tree.Search("foo.example.dev"))
assert.Nil(t, tree.Search("example.com")) assert.Nil(t, tree.Search("example.com"))