a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix race in safesearch tests

This commit is contained in:
Andrey Meshkov 2019-02-25 18:56:51 +03:00
parent 77348e746f
commit c71d6ed433
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dnsfilter/dnsfilter_test.go
View File

@ -654,13 +654,19 @@ func TestCheckHostSafeSearchGoogle(t *testing.T) {
} }
} }
func TestSafeSearchCacheYandex (t *testing.T) { func TestSafeSearchCacheYandex(t *testing.T) {
d := NewForTest() d := NewForTest()
defer d.Destroy() defer d.Destroy()
domain := "yandex.ru" domain := "yandex.ru"
var result Result
var err error
// Check host with disabled safesearch // Check host with disabled safesearch
result, err := d.CheckHost(domain) result, err = d.CheckHost(domain)
if err != nil {
t.Fatalf("Cannot check host due to %s", err)
}
if result.IP != nil { if result.IP != nil {
t.Fatalf("SafeSearch is not enabled but there is an answer for `%s` !", domain) t.Fatalf("SafeSearch is not enabled but there is an answer for `%s` !", domain)
} }
@ -693,11 +699,14 @@ func TestSafeSearchCacheYandex (t *testing.T) {
} }
} }
func TestSafeSearchCacheGoogle (t *testing.T) { func TestSafeSearchCacheGoogle(t *testing.T) {
d := NewForTest() d := NewForTest()
defer d.Destroy() defer d.Destroy()
domain := "www.google.ru" domain := "www.google.ru"
result, err := d.CheckHost(domain) result, err := d.CheckHost(domain)
if err != nil {
t.Fatalf("Cannot check host due to %s", err)
}
if result.IP != nil { if result.IP != nil {
t.Fatalf("SafeSearch is not enabled but there is an answer!") t.Fatalf("SafeSearch is not enabled but there is an answer!")
} }

10
dnsfilter/safesearch.go
View File

@ -1,11 +1,11 @@
package dnsfilter package dnsfilter
var safeSearchDomains = map[string]string{ var safeSearchDomains = map[string]string{
"yandex.com": "213.180.193.56", "yandex.com": "213.180.193.56",
"yandex.ru": "213.180.193.56", "yandex.ru": "213.180.193.56",
"yandex.ua": "213.180.193.56", "yandex.ua": "213.180.193.56",
"yandex.by": "213.180.193.56", "yandex.by": "213.180.193.56",
"yandex.kz": "213.180.193.56", "yandex.kz": "213.180.193.56",
"www.yandex.com": "213.180.193.56", "www.yandex.com": "213.180.193.56",
"www.yandex.ru": "213.180.193.56", "www.yandex.ru": "213.180.193.56",
"www.yandex.ua": "213.180.193.56", "www.yandex.ua": "213.180.193.56",

8
dnsforward/dnsforward_test.go
View File

@ -157,7 +157,7 @@ func TestSafeSearch(t *testing.T) {
client := dns.Client{Net: "udp"} client := dns.Client{Net: "udp"}
yandexDomains := []string{"yandex.com.", "yandex.by.", "yandex.kz.", "yandex.ru.", "yandex.com."} yandexDomains := []string{"yandex.com.", "yandex.by.", "yandex.kz.", "yandex.ru.", "yandex.com."}
for _, host := range yandexDomains { for _, host := range yandexDomains {
exchangeAndAssertResponse(t, client, addr, host, "213.180.193.56") exchangeAndAssertResponse(t, &client, addr, host, "213.180.193.56")
} }
// Check aggregated stats // Check aggregated stats
@ -182,7 +182,7 @@ func TestSafeSearch(t *testing.T) {
// Test safe search for google. // Test safe search for google.
googleDomains := []string{"www.google.com.", "www.google.com.af.", "www.google.be.", "www.google.by."} googleDomains := []string{"www.google.com.", "www.google.com.af.", "www.google.be.", "www.google.by."}
for _, host := range googleDomains { for _, host := range googleDomains {
exchangeAndAssertResponse(t, client, addr, host, ip.String()) exchangeAndAssertResponse(t, &client, addr, host, ip.String())
} }
// Check aggregated stats // Check aggregated stats
@ -191,7 +191,7 @@ func TestSafeSearch(t *testing.T) {
assert.Equal(t, s.GetAggregatedStats()["dns_queries"], float64(len(yandexDomains)+len(googleDomains))) assert.Equal(t, s.GetAggregatedStats()["dns_queries"], float64(len(yandexDomains)+len(googleDomains)))
// Do one more exchange // Do one more exchange
exchangeAndAssertResponse(t, client, addr, "google-public-dns-a.google.com.", "8.8.8.8") exchangeAndAssertResponse(t, &client, addr, "google-public-dns-a.google.com.", "8.8.8.8")
// Check aggregated stats // Check aggregated stats
assert.Equal(t, s.GetAggregatedStats()["replaced_safesearch"], float64(len(yandexDomains)+len(googleDomains))) assert.Equal(t, s.GetAggregatedStats()["replaced_safesearch"], float64(len(yandexDomains)+len(googleDomains)))
@ -524,7 +524,7 @@ func sendTestMessages(t *testing.T, conn *dns.Conn) {
} }
} }
func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) { func exchangeAndAssertResponse(t *testing.T, client *dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host) req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String()) reply, _, err := client.Exchange(req, addr.String())
if err != nil { if err != nil {

5
dnsforward/stats.go
View File

@ -61,9 +61,11 @@ func newStats() *stats {
} }
func initPeriodicStats(periodic *periodicStats, period time.Duration) { func initPeriodicStats(periodic *periodicStats, period time.Duration) {
periodic.Lock()
periodic.entries = statsEntries{} periodic.entries = statsEntries{}
periodic.lastRotate = time.Now() periodic.lastRotate = time.Now()
periodic.period = period periodic.period = period
periodic.Unlock()
} }
func (s *stats) purgeStats() { func (s *stats) purgeStats() {
@ -253,6 +255,9 @@ func (s *stats) getAggregatedStats() map[string]interface{} {
} }
func (s *stats) generateMapFromStats(stats *periodicStats, start int, end int) map[string]interface{} { func (s *stats) generateMapFromStats(stats *periodicStats, start int, end int) map[string]interface{} {
stats.RLock()
defer stats.RUnlock()
// clamp // clamp
start = clamp(start, 0, statsHistoryElements) start = clamp(start, 0, statsHistoryElements)
end = clamp(end, 0, statsHistoryElements) end = clamp(end, 0, statsHistoryElements)