mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 21:15:35 +03:00
e08a64ebe4
Updates #2624. Updates #3162. Squashed commit of the following: commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:41:33 2021 +0300 all: imp types, names commit ebd4ec26636853d0d58c4e331e6a78feede20813 Merge: 239eb72116e5e09c
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:14:33 2021 +0300 Merge branch 'master' into 2624-clientid-access commit 239eb7215abc47e99a0300a0f4cf56002689b1a9 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:13:10 2021 +0300 all: fix client blocking check commit e6bece3ea8367b3cbe3d90702a3368c870ad4f13 Merge: 9935f2a39d1656b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 13:12:28 2021 +0300 Merge branch 'master' into 2624-clientid-access commit 9935f2a30bcfae2b853f3ef610c0ab7a56a8f448 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jun 29 11:26:51 2021 +0300 client: show block button for client id commit ed786a6a74a081cd89e9d67df3537a4fadd54831 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 15:56:23 2021 +0300 client: imp i18n commit 4fed21c68473ad408960c08a7d87624cabce1911 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 15:34:09 2021 +0300 all: imp i18n, docs commit 55e65c0d6b939560c53dcb834a4557eb3853d194 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 13:34:01 2021 +0300 all: fix cache, imp code, docs, tests commit c1e5a83e76deb44b1f92729bb9ddfcc6a96ac4a8 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Jun 24 19:27:12 2021 +0300 all: allow clientid in access settings
130 lines
2.7 KiB
Go
130 lines
2.7 KiB
Go
package aghnet
|
|
|
|
import (
|
|
"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 := os.CreateTemp(dir, "")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, f)
|
|
|
|
t.Cleanup(func() {
|
|
assert.NoError(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.NoError(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().Get(net.IP{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
|
|
wantHost string
|
|
wantLen int
|
|
}{
|
|
{wantIP: "127.0.0.1", wantHost: "host", wantLen: 2},
|
|
{wantIP: "::1", wantHost: "localhost", wantLen: 1},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
a, err := dns.ReverseAddr(tc.wantIP)
|
|
require.NoError(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.NoError(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]))
|
|
})
|
|
}
|