7fab31beae
Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master Closes #2508. Squashed commit of the following: commit 5b9d33f9cd352756831f63e34c4aea48674628c1 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 20 17:15:17 2021 +0300 util: replace net.IPNet with pointer commit 680126de7d59464077f9edf1bbaa925dd3fcee19 Merge: d3ba6a6c5a50efadAuthor: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 20 17:02:41 2021 +0300 Merge branch 'master' into 2508-ip-conversion-vol2 commit d3ba6a6cdd01c0aa736418fdb86ed40120169fe9 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 19 18:29:54 2021 +0300 all: remove last conversion commit 88b63f11a6c3f8705d7fa0c448c50dd646cc9214 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 19 14:12:45 2021 +0300 all: improve code quality commit 71af60c70a0dbaf55e2221023d6d2e4993c9e9a7 Merge: 98af37849f75725dAuthor: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 18 17:13:27 2021 +0300 Merge branch 'master' into 2508-ip-conversion-vol2 commit 98af3784ce44d0993d171653c13d6e83bb8d1e6a Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 18 16:32:53 2021 +0300 all: log changes commit e99595a172bae1e844019d344544be84ddd65e4e Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 18 16:06:49 2021 +0300 all: fix or remove remaining net.IP <-> string conversions commit 7fd0634ce945f7e4c9b856684c5199f8a84a543e Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Jan 15 15:36:17 2021 +0300 all: remove redundant net.IP <-> string converions commit 5df8af030421237d41b67ed659f83526cc258199 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Jan 14 16:35:25 2021 +0300 stats: remove redundant net.IP <-> string conversion commit fbe4e3fc015e6898063543a90c04401d76dbb18f Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Jan 14 16:20:35 2021 +0300 querylog: remove redundant net.IP <-> string conversion
125 lines
3.2 KiB
Go
125 lines
3.2 KiB
Go
package util
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"net"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/testutil"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
testutil.DiscardLogOutput(m)
|
|
}
|
|
|
|
func prepareTestDir() string {
|
|
const dir = "./agh-test"
|
|
_ = os.RemoveAll(dir)
|
|
_ = os.MkdirAll(dir, 0o755)
|
|
return dir
|
|
}
|
|
|
|
func TestAutoHostsResolution(t *testing.T) {
|
|
ah := AutoHosts{}
|
|
|
|
dir := prepareTestDir()
|
|
defer func() { _ = os.RemoveAll(dir) }()
|
|
|
|
f, _ := ioutil.TempFile(dir, "")
|
|
defer func() { _ = os.Remove(f.Name()) }()
|
|
defer f.Close()
|
|
|
|
_, _ = f.WriteString(" 127.0.0.1 host localhost # comment \n")
|
|
_, _ = f.WriteString(" ::1 localhost#comment \n")
|
|
|
|
ah.Init(f.Name())
|
|
|
|
// Existing host
|
|
ips := ah.Process("localhost", dns.TypeA)
|
|
assert.NotNil(t, ips)
|
|
assert.Len(t, ips, 1)
|
|
assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
|
|
|
|
// Unknown host
|
|
ips = ah.Process("newhost", dns.TypeA)
|
|
assert.Nil(t, ips)
|
|
|
|
// Unknown host (comment)
|
|
ips = ah.Process("comment", dns.TypeA)
|
|
assert.Nil(t, ips)
|
|
|
|
// Test hosts file
|
|
table := ah.List()
|
|
names, ok := table["127.0.0.1"]
|
|
assert.True(t, ok)
|
|
assert.Equal(t, []string{"host", "localhost"}, names)
|
|
|
|
// Test PTR
|
|
a, _ := dns.ReverseAddr("127.0.0.1")
|
|
a = strings.TrimSuffix(a, ".")
|
|
hosts := ah.ProcessReverse(a, dns.TypePTR)
|
|
if assert.Len(t, hosts, 2) {
|
|
assert.Equal(t, hosts[0], "host")
|
|
}
|
|
|
|
a, _ = dns.ReverseAddr("::1")
|
|
a = strings.TrimSuffix(a, ".")
|
|
hosts = ah.ProcessReverse(a, dns.TypePTR)
|
|
if assert.Len(t, hosts, 1) {
|
|
assert.Equal(t, hosts[0], "localhost")
|
|
}
|
|
}
|
|
|
|
func TestAutoHostsFSNotify(t *testing.T) {
|
|
ah := AutoHosts{}
|
|
|
|
dir := prepareTestDir()
|
|
defer func() { _ = os.RemoveAll(dir) }()
|
|
|
|
f, _ := ioutil.TempFile(dir, "")
|
|
defer func() { _ = os.Remove(f.Name()) }()
|
|
defer f.Close()
|
|
|
|
// Init
|
|
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
|
|
ah.Init(f.Name())
|
|
|
|
// Unknown host
|
|
ips := ah.Process("newhost", dns.TypeA)
|
|
assert.Nil(t, ips)
|
|
|
|
// Stat monitoring for changes
|
|
ah.Start()
|
|
defer ah.Close()
|
|
|
|
// Update file
|
|
_, _ = f.WriteString("127.0.0.2 newhost\n")
|
|
_ = f.Sync()
|
|
|
|
// wait until fsnotify has triggerred and processed the file-modification event
|
|
time.Sleep(50 * time.Millisecond)
|
|
|
|
// Check if we are notified about changes
|
|
ips = ah.Process("newhost", dns.TypeA)
|
|
assert.NotNil(t, ips)
|
|
assert.Len(t, ips, 1)
|
|
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
|
|
}
|
|
|
|
func TestIP(t *testing.T) {
|
|
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
|
|
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
|
|
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
|
|
|
|
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
|
|
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
|
|
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
|
|
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
|
|
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
|
|
}
|