Add more fuzz rules support @Release

sower-proxy · Jan 28, 2019 · 8194083 · 8194083
1 parent c209031
commit 8194083
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/conf/sower.toml b/conf/sower.toml
@@ -23,4 +23,9 @@ blocklist=[
     "*.blogspot.com", # blogspot
     "*.wikipedia.org", # wikipeida
 ]
+whitelist=[
+    "iamp.*.*.*",
+    "iamp.*.*",
+    "imap-mail.*.*",
+]
 verbose=0
diff --git a/dns/util.go b/dns/util.go
@@ -20,7 +20,7 @@ func init() {
 
 	//first init
 	blockList = loadRules("block", conf.Conf.BlockList)
-	suggestList = loadRules("suggest", conf.Conf.BlockList)
+	suggestList = loadRules("suggest", conf.Conf.Suggestions)
 	whiteList = loadRules("white", conf.Conf.WhiteList)
 	whiteList.Add(host)
 

diff --git a/util/suffix_tree.go b/util/suffix_tree.go
@@ -64,23 +64,27 @@ func (n *node) add(secs []string) {
 }
 
 func (n *Node) Match(item string) bool {
-	return n.matchSecs(strings.Split(n.trim(item), n.sep))
+	return n.matchSecs(strings.Split(n.trim(item), n.sep), false)
 }
 
-func (n *node) matchSecs(secs []string) bool {
+func (n *node) matchSecs(secs []string, fuzzNode bool) bool {
 	length := len(secs)
 	if length == 0 {
 		if _, ok := n.node[""]; ok {
 			return true
 		}
-		_, ok := n.node["*"]
-		return ok
+		if _, ok := n.node["*"]; ok {
+			return !fuzzNode
+		}
+		return false
 	}
 
 	if n, ok := n.node[secs[length-1]]; ok {
-		return n.matchSecs(secs[:length-1])
+		return n.matchSecs(secs[:length-1], false)
+	}
+	if n, ok := n.node["*"]; ok {
+		return n.matchSecs(secs[:length-1], true)
 	}
 
-	_, ok := n.node["*"]
-	return ok
+	return false
 }
diff --git a/util/suffix_tree_test.go b/util/suffix_tree_test.go
@@ -43,6 +43,23 @@ func TestNode_Match(t *testing.T) {
 			{"a.wweir.cc", true},
 			{"b.wweir.cc", true},
 		},
+	}, {
+		"fuzz3",
+		NewNodeFromRules(".", "a.*.cc"),
+		[]test{
+			{"wweir.cc", false},
+			{"a.wweir.cc", true},
+			{"b.wweir.cc", false},
+		},
+	}, {
+		"fuzz4",
+		NewNodeFromRules(".", "*.*.cc", "iamp.*.*"),
+		[]test{
+			{"wweir.cc", false},
+			{"a.wweir.cc", true},
+			{"b.wweir.cc", true},
+			{"iamp.wweir.cc", true},
+		},
 	}}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {