Merge with master

AdguardTeam · Jun 23, 2020 · 576bf02 · 576bf02
2 parents 8ed2f2e + 5dd65ce
commit 576bf02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/dns_engine_test.go b/dns_engine_test.go
@@ -220,45 +220,45 @@ func TestClientTags(t *testing.T) {
 
 	// tags don't match
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host2", SortedClientTags: []string{"phone"}})
-	assert.True(t, !ok)
+	assert.False(t, ok)
 
 	// tags don't match
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host2", SortedClientTags: []string{}})
-	assert.True(t, !ok)
+	assert.False(t, ok)
 
 	// 1 tag matches (exclusion)
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host3", SortedClientTags: []string{"phone", "printer"}})
 	assert.True(t, ok)
-	assert.True(t, rules.NetworkRule != nil)
-	assert.True(t, rules.NetworkRule.Text() == "||host3^$ctag=~pc|~router")
+	assert.NotNil(t, rules.NetworkRule)
+	assert.Equal(t, "||host3^$ctag=~pc|~router", rules.NetworkRule.Text())
 
 	// 1 tag matches (exclusion)
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host4", SortedClientTags: []string{"phone", "router"}})
 	assert.True(t, ok)
-	assert.True(t, rules.NetworkRule != nil)
-	assert.True(t, rules.NetworkRule.Text() == "||host4^$ctag=~pc|router")
+	assert.NotNil(t, rules.NetworkRule)
+	assert.Equal(t, "||host4^$ctag=~pc|router", rules.NetworkRule.Text())
 
 	// tags don't match (exclusion)
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host3", SortedClientTags: []string{"pc"}})
-	assert.True(t, !ok)
+	assert.False(t, ok)
 
 	// tags don't match (exclusion)
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host4", SortedClientTags: []string{"pc", "router"}})
-	assert.True(t, !ok)
+	assert.False(t, ok)
 
 	// tags match but it's a $badfilter
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host5", SortedClientTags: []string{"pc"}})
-	assert.True(t, !ok)
+	assert.False(t, ok)
 
 	// tags match and $badfilter rule disables global rule
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host6", SortedClientTags: []string{"pc"}})
 	assert.True(t, ok)
-	assert.True(t, rules.NetworkRule != nil)
-	assert.True(t, rules.NetworkRule.Text() == "||host6^$ctag=pc|printer")
+	assert.NotNil(t, rules.NetworkRule)
+	assert.Equal(t, "||host6^$ctag=pc|printer", rules.NetworkRule.Text())
 
 	// tags match (exclusion) but it's a $badfilter
 	rules, ok = dnsEngine.MatchRequest(DNSRequest{Hostname: "host7", SortedClientTags: []string{"phone"}})
-	assert.True(t, !ok)
+	assert.False(t, ok)
 }
 
 func TestBadfilterRules(t *testing.T) {

diff --git a/rules/network_rule.go b/rules/network_rule.go
@@ -507,10 +507,6 @@ func (f *NetworkRule) matchClientTags(sortedTags []string) bool {
 		// the rule doesn't contain $ctag extension
 		return true
 	}
-	if len(sortedTags) == 0 {
-		// client has no tags
-		return false
-	}
 	if matchClientTagsSpecific(f.restrictedClientTags, sortedTags) {
 		// matched by restricted client tag
 		return false