mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-17 21:31:43 +03:00
e671f43a2f
Merge in DNS/adguard-home from 1947-hosts-opt to master
Updates #1947.
Updates #2829.
Squashed commit of the following:
commit d09285c3dbfa7816469eec223b88c320c255c8fe
Merge: cff8c4cd 7c6557b0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 18:23:20 2021 +0300
Merge branch 'master' into 1947-hosts-opt
commit cff8c4cdbf4bcd1f5f413c541d7f4a9e42b8b05b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 17:46:19 2021 +0300
home: fix help
commit 1fa01d5b30f5adeda564dcc85a7064e2921d5981
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 17:40:48 2021 +0300
home: fix option order
commit 9d83cb604aaddcc8cbe99bafa544636f8f0b7e54
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 17:28:30 2021 +0300
aghnet: add important todo
commit 7f1386ff5c3081e07e975b640164a7a05e1319c9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 17:17:17 2021 +0300
all: correct naming
commit cbe2b2e4b21d5bceb3ee88e09cad154ba62b5cef
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 15:55:46 2021 +0300
all: mv functionality from util
commit e82ad53862682d903dd0dd10844db65997a758bc
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 15:41:35 2021 +0300
home: imp code, docs
commit 9058977f3ff99648fabaebbd7c1c354c71671327
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 15:02:34 2021 +0300
home: add an option to disable autohosts
131 lines
2.7 KiB
Go
131 lines
2.7 KiB
Go
package aghnet
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"net"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
aghtest.DiscardLogOutput(m)
|
|
}
|
|
|
|
func prepareTestFile(t *testing.T) (f *os.File) {
|
|
t.Helper()
|
|
|
|
dir := t.TempDir()
|
|
|
|
f, err := ioutil.TempFile(dir, "")
|
|
require.Nil(t, err)
|
|
require.NotNil(t, f)
|
|
t.Cleanup(func() {
|
|
assert.Nil(t, f.Close())
|
|
})
|
|
|
|
return f
|
|
}
|
|
|
|
func assertWriting(t *testing.T, f *os.File, strs ...string) {
|
|
t.Helper()
|
|
|
|
for _, str := range strs {
|
|
n, err := f.WriteString(str)
|
|
require.Nil(t, err)
|
|
assert.Equal(t, n, len(str))
|
|
}
|
|
}
|
|
|
|
func TestEtcHostsContainerResolution(t *testing.T) {
|
|
ehc := &EtcHostsContainer{}
|
|
|
|
f := prepareTestFile(t)
|
|
|
|
assertWriting(t, f,
|
|
" 127.0.0.1 host localhost # comment \n",
|
|
" ::1 localhost#comment \n",
|
|
)
|
|
ehc.Init(f.Name())
|
|
|
|
t.Run("existing_host", func(t *testing.T) {
|
|
ips := ehc.Process("localhost", dns.TypeA)
|
|
require.Len(t, ips, 1)
|
|
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
|
|
})
|
|
|
|
t.Run("unknown_host", func(t *testing.T) {
|
|
ips := ehc.Process("newhost", dns.TypeA)
|
|
assert.Nil(t, ips)
|
|
|
|
// Comment.
|
|
ips = ehc.Process("comment", dns.TypeA)
|
|
assert.Nil(t, ips)
|
|
})
|
|
|
|
t.Run("hosts_file", func(t *testing.T) {
|
|
names, ok := ehc.List()["127.0.0.1"]
|
|
require.True(t, ok)
|
|
assert.Equal(t, []string{"host", "localhost"}, names)
|
|
})
|
|
|
|
t.Run("ptr", func(t *testing.T) {
|
|
testCases := []struct {
|
|
wantIP string
|
|
wantLen int
|
|
wantHost string
|
|
}{
|
|
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
|
|
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
a, err := dns.ReverseAddr(tc.wantIP)
|
|
require.Nil(t, err)
|
|
|
|
a = strings.TrimSuffix(a, ".")
|
|
hosts := ehc.ProcessReverse(a, dns.TypePTR)
|
|
require.Len(t, hosts, tc.wantLen)
|
|
assert.Equal(t, tc.wantHost, hosts[0])
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestEtcHostsContainerFSNotify(t *testing.T) {
|
|
ehc := &EtcHostsContainer{}
|
|
|
|
f := prepareTestFile(t)
|
|
|
|
assertWriting(t, f, " 127.0.0.1 host localhost \n")
|
|
ehc.Init(f.Name())
|
|
|
|
t.Run("unknown_host", func(t *testing.T) {
|
|
ips := ehc.Process("newhost", dns.TypeA)
|
|
assert.Nil(t, ips)
|
|
})
|
|
|
|
// Start monitoring for changes.
|
|
ehc.Start()
|
|
t.Cleanup(ehc.Close)
|
|
|
|
assertWriting(t, f, "127.0.0.2 newhost\n")
|
|
require.Nil(t, f.Sync())
|
|
|
|
// Wait until fsnotify has triggerred and processed the
|
|
// file-modification event.
|
|
time.Sleep(50 * time.Millisecond)
|
|
|
|
t.Run("notified", func(t *testing.T) {
|
|
ips := ehc.Process("newhost", dns.TypeA)
|
|
assert.NotNil(t, ips)
|
|
require.Len(t, ips, 1)
|
|
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
|
|
})
|
|
}
|