mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-18 05:41:55 +03:00
bea39934bd
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master Squashed commit of the following: commit 4acd094e2d6ed972bac99cdb671670f6d8e61721 Merge: 51f61c19df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 23 16:44:17 2023 +0300 Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr commit 51f61c193fdd31ee675be5598fc361228e407eb3 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 18:25:30 2023 +0300 dhcpd: fix typo commit 2e64ad55475957925d2a3010c649e0adc5f18c4f Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 17:20:31 2023 +0300 dhcpd: add todo commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80 Merge: 0020006e306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 15:09:38 2023 +0300 Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 15:08:58 2023 +0300 all: imp code commit 9a77f79869cdbde6de760734c0d8cf504e0464ef Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 18:13:35 2023 +0300 dhcpd: add todo commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a Merge: c82b18f148431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 13:57:19 2023 +0300 Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr commit c82b18f1408d9e353aec517f4283e2f3eb260890 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 13:56:31 2023 +0300 all: imp code commit 27e518120024103c292ac1cf134c6801fffc967e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 17 12:14:02 2023 +0300 dhcpd: imp tests commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 17 11:02:50 2023 +0300 dhcpd: add tests commit 78ddefa73a255509af1c788147d6b1c332bb66ba Merge: c68e85c49f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 16 14:15:24 2023 +0300 Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr commit c68e85c40947b6c83516424a2bd7af89b99447b4 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 16 14:14:43 2023 +0300 all: add tests commit f338086309a68c4b71036fa14f757e39358702d4 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 15 12:44:06 2023 +0300 all: dhcpd lease netip addr
355 lines
8.1 KiB
Go
355 lines
8.1 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 := netip.MustParseAddr("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)
|
|
}
|