mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-01-10 16:07:25 +03:00
2b5e4850d0
Merge in DNS/adguard-home from 1163-safesearch-1-2-1 to master Squashed commit of the following: commit d3a5ebef35210019842145074e898129b42f1f2c Merge: b85264aec6706445
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 15 09:17:53 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 # Conflicts: # CHANGELOG.md commit b85264aefc5f191ac6cb194b519f03ba15829a4e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 14 00:16:07 2023 +0700 home: imp code commit ac2ed7a5ce8db40628e7d4d1c8634641e5f38b0b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 23:02:06 2023 +0700 all: changelog commit f0fccafcb01f50c7051df53bbe9b02cab75aa71e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 22:42:36 2023 +0700 all: changelog commit 37df29bf6372939644fb28e3d70365496e0cb4f6 Merge: b227b277595484e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 22:38:57 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 commit b227b2775b4866d69241ad87acf99700715552cb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 16:56:01 2023 +0700 all: imp docs commit 6fd39fc3565c3f4bc7a7113d17733c20dfe24d8d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 16:55:03 2023 +0700 home: imp code commit 3bb3bb7c7dcf97b2a5602a7d2b6770c08b4d863d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 12:16:53 2023 +0700 home: imp docs commit 5f573a56a9fd9942ad677fa0fae6b24228dab653 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 11:56:47 2023 +0700 home: imp code commit 23eeb5552cf2510596b2311cc3eda53ac678ffcc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 10 10:57:33 2023 +0700 home: imp code commit 643de2fca1b5917c61fe83e1e472222404f3cd21 Merge: dada6e63a2053526
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 21:03:08 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 commit dada6e63ca5324d30775e2da1727da891743f654 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 17:09:03 2023 +0700 all: imp docs commit 81a180d99dd9a995440d5f4e2ebca34678e7d0c7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 15:12:43 2023 +0700 all: imp code commit fa84877bc777004d246d71d0a9ae0bd9ee568a91 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 10:53:05 2023 +0700 all: imp code commit 6d7e02e745d72921a693d4f09eec7ce21c2aefd4 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 10:40:02 2023 +0700 all: imp docs commit 0a4332997070fb8d2fb3a34d32b92f57a325ff06 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 7 22:00:52 2023 +0700 safesearch: fix merge commit 145c2222ba4cf7f8909b816d83829d2217c94243 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 2 11:41:48 2023 +0700 safesearch: fix merge commit 14c6a8005fe15b5d5a39f91b17c96d8670975811 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 12:50:09 2023 +0700 all: docs commit 2a85c8831866bf1c34c423a289461fc1e32667b5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 12:47:00 2023 +0700 all: use safesearch package
354 lines
8 KiB
Go
354 lines
8 KiB
Go
package home
|
|
|
|
import (
|
|
"net"
|
|
"net/netip"
|
|
"os"
|
|
"runtime"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
|
|
"github.com/AdguardTeam/golibs/testutil"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestClients(t *testing.T) {
|
|
clients := clientsContainer{}
|
|
clients.testing = true
|
|
|
|
clients.Init(nil, nil, nil, nil, nil)
|
|
|
|
t.Run("add_success", func(t *testing.T) {
|
|
var (
|
|
cliNone = "1.2.3.4"
|
|
cli1 = "1.1.1.1"
|
|
cli2 = "2.2.2.2"
|
|
|
|
cliNoneIP = netip.MustParseAddr(cliNone)
|
|
cli1IP = netip.MustParseAddr(cli1)
|
|
cli2IP = netip.MustParseAddr(cli2)
|
|
)
|
|
|
|
c := &Client{
|
|
IDs: []string{cli1, "1:2:3::4", "aa:aa:aa:aa:aa:aa"},
|
|
Name: "client1",
|
|
}
|
|
|
|
ok, err := clients.Add(c)
|
|
require.NoError(t, err)
|
|
|
|
assert.True(t, ok)
|
|
|
|
c = &Client{
|
|
IDs: []string{cli2},
|
|
Name: "client2",
|
|
}
|
|
|
|
ok, err = clients.Add(c)
|
|
require.NoError(t, err)
|
|
|
|
assert.True(t, ok)
|
|
|
|
c, ok = clients.Find(cli1)
|
|
require.True(t, ok)
|
|
|
|
assert.Equal(t, "client1", c.Name)
|
|
|
|
c, ok = clients.Find("1:2:3::4")
|
|
require.True(t, ok)
|
|
|
|
assert.Equal(t, "client1", c.Name)
|
|
|
|
c, ok = clients.Find(cli2)
|
|
require.True(t, ok)
|
|
|
|
assert.Equal(t, "client2", c.Name)
|
|
|
|
assert.Equal(t, clients.clientSource(cliNoneIP), ClientSourceNone)
|
|
assert.Equal(t, clients.clientSource(cli1IP), ClientSourcePersistent)
|
|
assert.Equal(t, clients.clientSource(cli2IP), ClientSourcePersistent)
|
|
})
|
|
|
|
t.Run("add_fail_name", func(t *testing.T) {
|
|
ok, err := clients.Add(&Client{
|
|
IDs: []string{"1.2.3.5"},
|
|
Name: "client1",
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, ok)
|
|
})
|
|
|
|
t.Run("add_fail_ip", func(t *testing.T) {
|
|
ok, err := clients.Add(&Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client3",
|
|
})
|
|
require.Error(t, err)
|
|
assert.False(t, ok)
|
|
})
|
|
|
|
t.Run("update_fail_name", func(t *testing.T) {
|
|
err := clients.Update("client3", &Client{
|
|
IDs: []string{"1.2.3.0"},
|
|
Name: "client3",
|
|
})
|
|
require.Error(t, err)
|
|
|
|
err = clients.Update("client3", &Client{
|
|
IDs: []string{"1.2.3.0"},
|
|
Name: "client2",
|
|
})
|
|
assert.Error(t, err)
|
|
})
|
|
|
|
t.Run("update_fail_ip", func(t *testing.T) {
|
|
err := clients.Update("client1", &Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client1",
|
|
})
|
|
assert.Error(t, err)
|
|
})
|
|
|
|
t.Run("update_success", func(t *testing.T) {
|
|
var (
|
|
cliOld = "1.1.1.1"
|
|
cliNew = "1.1.1.2"
|
|
|
|
cliOldIP = netip.MustParseAddr(cliOld)
|
|
cliNewIP = netip.MustParseAddr(cliNew)
|
|
)
|
|
|
|
err := clients.Update("client1", &Client{
|
|
IDs: []string{cliNew},
|
|
Name: "client1",
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, clients.clientSource(cliOldIP), ClientSourceNone)
|
|
assert.Equal(t, clients.clientSource(cliNewIP), ClientSourcePersistent)
|
|
|
|
err = clients.Update("client1", &Client{
|
|
IDs: []string{cliNew},
|
|
Name: "client1-renamed",
|
|
UseOwnSettings: true,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
c, ok := clients.Find(cliNew)
|
|
require.True(t, ok)
|
|
|
|
assert.Equal(t, "client1-renamed", c.Name)
|
|
assert.True(t, c.UseOwnSettings)
|
|
|
|
nilCli, ok := clients.list["client1"]
|
|
require.False(t, ok)
|
|
|
|
assert.Nil(t, nilCli)
|
|
|
|
require.Len(t, c.IDs, 1)
|
|
|
|
assert.Equal(t, cliNew, c.IDs[0])
|
|
})
|
|
|
|
t.Run("del_success", func(t *testing.T) {
|
|
ok := clients.Del("client1-renamed")
|
|
require.True(t, ok)
|
|
|
|
assert.Equal(t, clients.clientSource(netip.MustParseAddr("1.1.1.2")), ClientSourceNone)
|
|
})
|
|
|
|
t.Run("del_fail", func(t *testing.T) {
|
|
ok := clients.Del("client3")
|
|
assert.False(t, ok)
|
|
})
|
|
|
|
t.Run("addhost_success", func(t *testing.T) {
|
|
ip := netip.MustParseAddr("1.1.1.1")
|
|
ok := clients.AddHost(ip, "host", ClientSourceARP)
|
|
assert.True(t, ok)
|
|
|
|
ok = clients.AddHost(ip, "host2", ClientSourceARP)
|
|
assert.True(t, ok)
|
|
|
|
ok = clients.AddHost(ip, "host3", ClientSourceHostsFile)
|
|
assert.True(t, ok)
|
|
|
|
assert.Equal(t, clients.clientSource(ip), ClientSourceHostsFile)
|
|
})
|
|
|
|
t.Run("dhcp_replaces_arp", func(t *testing.T) {
|
|
ip := netip.MustParseAddr("1.2.3.4")
|
|
ok := clients.AddHost(ip, "from_arp", ClientSourceARP)
|
|
assert.True(t, ok)
|
|
assert.Equal(t, clients.clientSource(ip), ClientSourceARP)
|
|
|
|
ok = clients.AddHost(ip, "from_dhcp", ClientSourceDHCP)
|
|
assert.True(t, ok)
|
|
assert.Equal(t, clients.clientSource(ip), ClientSourceDHCP)
|
|
})
|
|
|
|
t.Run("addhost_fail", func(t *testing.T) {
|
|
ip := netip.MustParseAddr("1.1.1.1")
|
|
ok := clients.AddHost(ip, "host1", ClientSourceRDNS)
|
|
assert.False(t, ok)
|
|
})
|
|
}
|
|
|
|
func TestClientsWHOIS(t *testing.T) {
|
|
clients := clientsContainer{
|
|
testing: true,
|
|
}
|
|
clients.Init(nil, nil, nil, nil, nil)
|
|
whois := &RuntimeClientWHOISInfo{
|
|
Country: "AU",
|
|
Orgname: "Example Org",
|
|
}
|
|
|
|
t.Run("new_client", func(t *testing.T) {
|
|
ip := netip.MustParseAddr("1.1.1.255")
|
|
clients.setWHOISInfo(ip, whois)
|
|
rc := clients.ipToRC[ip]
|
|
require.NotNil(t, rc)
|
|
|
|
assert.Equal(t, rc.WHOISInfo, whois)
|
|
})
|
|
|
|
t.Run("existing_auto-client", func(t *testing.T) {
|
|
ip := netip.MustParseAddr("1.1.1.1")
|
|
ok := clients.AddHost(ip, "host", ClientSourceRDNS)
|
|
assert.True(t, ok)
|
|
|
|
clients.setWHOISInfo(ip, whois)
|
|
rc := clients.ipToRC[ip]
|
|
require.NotNil(t, rc)
|
|
|
|
assert.Equal(t, rc.WHOISInfo, whois)
|
|
})
|
|
|
|
t.Run("can't_set_manually-added", func(t *testing.T) {
|
|
ip := netip.MustParseAddr("1.1.1.2")
|
|
|
|
ok, err := clients.Add(&Client{
|
|
IDs: []string{"1.1.1.2"},
|
|
Name: "client1",
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, ok)
|
|
|
|
clients.setWHOISInfo(ip, whois)
|
|
rc := clients.ipToRC[ip]
|
|
require.Nil(t, rc)
|
|
|
|
assert.True(t, clients.Del("client1"))
|
|
})
|
|
}
|
|
|
|
func TestClientsAddExisting(t *testing.T) {
|
|
clients := clientsContainer{
|
|
testing: true,
|
|
}
|
|
clients.Init(nil, nil, nil, nil, nil)
|
|
|
|
t.Run("simple", func(t *testing.T) {
|
|
ip := netip.MustParseAddr("1.1.1.1")
|
|
|
|
// Add a client.
|
|
ok, err := clients.Add(&Client{
|
|
IDs: []string{ip.String(), "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
|
|
Name: "client1",
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, ok)
|
|
|
|
// Now add an auto-client with the same IP.
|
|
ok = clients.AddHost(ip, "test", ClientSourceRDNS)
|
|
assert.True(t, ok)
|
|
})
|
|
|
|
t.Run("complicated", func(t *testing.T) {
|
|
// TODO(a.garipov): Properly decouple the DHCP server from the client
|
|
// storage.
|
|
if runtime.GOOS == "windows" {
|
|
t.Skip("skipping dhcp test on windows")
|
|
}
|
|
|
|
ip := net.IP{1, 2, 3, 4}
|
|
|
|
// First, init a DHCP server with a single static lease.
|
|
config := &dhcpd.ServerConfig{
|
|
Enabled: true,
|
|
DBFilePath: "leases.db",
|
|
Conf4: dhcpd.V4ServerConf{
|
|
Enabled: true,
|
|
GatewayIP: netip.MustParseAddr("1.2.3.1"),
|
|
SubnetMask: netip.MustParseAddr("255.255.255.0"),
|
|
RangeStart: netip.MustParseAddr("1.2.3.2"),
|
|
RangeEnd: netip.MustParseAddr("1.2.3.10"),
|
|
},
|
|
}
|
|
|
|
dhcpServer, err := dhcpd.Create(config)
|
|
require.NoError(t, err)
|
|
testutil.CleanupAndRequireSuccess(t, func() (err error) {
|
|
return os.Remove("leases.db")
|
|
})
|
|
|
|
clients.dhcpServer = dhcpServer
|
|
|
|
err = dhcpServer.AddStaticLease(&dhcpd.Lease{
|
|
HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
|
|
IP: ip,
|
|
Hostname: "testhost",
|
|
Expiry: time.Now().Add(time.Hour),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
// Add a new client with the same IP as for a client with MAC.
|
|
ok, err := clients.Add(&Client{
|
|
IDs: []string{ip.String()},
|
|
Name: "client2",
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, ok)
|
|
|
|
// Add a new client with the IP from the first client's IP range.
|
|
ok, err = clients.Add(&Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client3",
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, ok)
|
|
})
|
|
}
|
|
|
|
func TestClientsCustomUpstream(t *testing.T) {
|
|
clients := clientsContainer{
|
|
testing: true,
|
|
}
|
|
clients.Init(nil, nil, nil, nil, nil)
|
|
|
|
// Add client with upstreams.
|
|
ok, err := clients.Add(&Client{
|
|
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa"},
|
|
Name: "client1",
|
|
Upstreams: []string{
|
|
"1.1.1.1",
|
|
"[/example.org/]8.8.8.8",
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, ok)
|
|
|
|
config, err := clients.findUpstreams("1.2.3.4")
|
|
assert.Nil(t, config)
|
|
assert.NoError(t, err)
|
|
|
|
config, err = clients.findUpstreams("1.1.1.1")
|
|
require.NotNil(t, config)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, config.Upstreams, 1)
|
|
assert.Len(t, config.DomainReservedUpstreams, 1)
|
|
}
|