63923fa882
- fix filtering logic: don't do DNS response check for Rewrite rules
Close #1478
Squashed commit of the following:
commit 1206b94881289ff664b7c8998ea97c1455da1ff8
Merge: c462577a 5fe98474
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 15:00:25 2020 +0300
Merge remote-tracking branch 'origin/master' into 1478-auto-records
commit c462577ad84754f5b3ea4cd58339838af817fe36
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 14:33:17 2020 +0300
minor
commit 7e824ba5f432648a976bc4b8076a645ba875ef70
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 14:29:54 2020 +0300
more tests
commit a22b62136c5cfd84cd0450897aef9e7d2e20585a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 14:09:52 2020 +0300
rename, move
commit 9e5ed49ad3c27c57d540edf18b78d29e56afb067
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Mar 19 15:33:27 2020 +0300
fix logic - don't do DNS response check for Rewrite rules
commit 6cfabc0348a41883b8bba834626a7e8760b76bf2
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Mar 19 11:35:07 2020 +0300
minor
commit 4540aed9327566078e5087d43c30f4e8bffab7b9
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Mar 19 11:03:24 2020 +0300
fix
commit 9ddddf7bded812da48613cc07084e360c15ddd0e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Mar 19 10:49:13 2020 +0300
fix
commit c5f8ef745b6f2a768be8a2ab23ad80b01b0aa54f
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Mar 19 10:37:26 2020 +0300
fix
commit f4be00947bf0528c9a7cd4f09c4090db444c4694
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Mar 16 20:13:00 2020 +0300
+ auto DNS records from /etc/hosts
55 lines
1.1 KiB
Go
55 lines
1.1 KiB
Go
package util
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"net"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func prepareTestDir() string {
|
|
const dir = "./agh-test"
|
|
_ = os.RemoveAll(dir)
|
|
_ = os.MkdirAll(dir, 0755)
|
|
return dir
|
|
}
|
|
|
|
func TestAutoHosts(t *testing.T) {
|
|
ah := AutoHosts{}
|
|
|
|
dir := prepareTestDir()
|
|
defer func() { _ = os.RemoveAll(dir) }()
|
|
|
|
f, _ := ioutil.TempFile(dir, "")
|
|
defer os.Remove(f.Name())
|
|
defer f.Close()
|
|
|
|
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
|
|
|
|
ah.Init(f.Name())
|
|
ah.Start()
|
|
// wait until we parse the file
|
|
time.Sleep(50 * time.Millisecond)
|
|
|
|
ips := ah.Process("localhost")
|
|
assert.True(t, ips[0].Equal(net.ParseIP("127.0.0.1")))
|
|
ips = ah.Process("newhost")
|
|
assert.True(t, len(ips) == 0)
|
|
|
|
table := ah.List()
|
|
ips, _ = table["host"]
|
|
assert.True(t, ips[0].String() == "127.0.0.1")
|
|
|
|
_, _ = f.WriteString("127.0.0.2 newhost\n")
|
|
// wait until fsnotify has triggerred and processed the file-modification event
|
|
time.Sleep(50 * time.Millisecond)
|
|
|
|
ips = ah.Process("newhost")
|
|
assert.True(t, ips[0].Equal(net.ParseIP("127.0.0.2")))
|
|
|
|
ah.Close()
|
|
}
|