Fix: domain trie should backtrack to parent if match fail (#758)

component/trie/domain.go

@@ -96,45 +96,37 @@ func (t *DomainTrie) Search(domain string) *Node {
 		return nil
 	}
 
-	n := t.root
-	var dotWildcardNode *Node
-	var wildcardNode *Node
-	for i := len(parts) - 1; i >= 0; i-- {
-		part := parts[i]
+	n := t.search(t.root, parts)
 
-		if node := n.getChild(dotWildcard); node != nil {
-			dotWildcardNode = node
-		}
+	if n.Data == nil {
+		return nil
+	}
 
-		child := n.getChild(part)
-		if child == nil && wildcardNode != nil {
-			child = wildcardNode.getChild(part)
-		}
-		wildcardNode = n.getChild(wildcard)
+	return n
+}
 
-		n = child
-		if n == nil {
-			n = wildcardNode
-			wildcardNode = nil
-		}
+func (t *DomainTrie) search(node *Node, parts []string) *Node {
+	if len(parts) == 0 {
+		return node
+	}
 
-		if n == nil {
-			break
+	if c := node.getChild(parts[len(parts)-1]); c != nil {
+		if n := t.search(c, parts[:len(parts)-1]); n != nil {
+			return n
 		}
 	}
 
-	if n == nil {
-		if dotWildcardNode != nil {
-			return dotWildcardNode
+	if c := node.getChild(wildcard); c != nil {
+		if n := t.search(c, parts[:len(parts)-1]); n != nil {
+			return n
 		}
-		return nil
 	}
 
-	if n.Data == nil {
-		return nil
+	if c := node.getChild(dotWildcard); c != nil {
+		return c
 	}
 
-	return n
+	return nil
 }
 
 // New returns a new, empty Trie.

component/trie/domain_test.go

@@ -39,6 +39,10 @@ func TestTrie_Wildcard(t *testing.T) {
 		".example.net",
 		".apple.*",
 		"+.foo.com",
+		"+.stun.*.*",
+		"+.stun.*.*.*",
+		"+.stun.*.*.*.*",
+		"stun.l.google.com",
 	}
 
 	for _, domain := range domains {
@@ -52,6 +56,7 @@ func TestTrie_Wildcard(t *testing.T) {
 	assert.NotNil(t, tree.Search("test.apple.com"))
 	assert.NotNil(t, tree.Search("test.foo.com"))
 	assert.NotNil(t, tree.Search("foo.com"))
+	assert.NotNil(t, tree.Search("global.stun.website.com"))
 	assert.Nil(t, tree.Search("foo.sub.example.com"))
 	assert.Nil(t, tree.Search("foo.example.dev"))
 	assert.Nil(t, tree.Search("example.com"))