mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 10:58:29 -07:00
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: d3ba6a6c5a50efad
Author: 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: 98af37849f75725d
Author: 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
281 lines
6.5 KiB
Go
281 lines
6.5 KiB
Go
package home
|
|
|
|
import (
|
|
"net"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestClients(t *testing.T) {
|
|
clients := clientsContainer{}
|
|
clients.testing = true
|
|
|
|
clients.Init(nil, nil, nil)
|
|
|
|
t.Run("add_success", func(t *testing.T) {
|
|
c := Client{
|
|
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa"},
|
|
Name: "client1",
|
|
}
|
|
|
|
b, err := clients.Add(c)
|
|
assert.True(t, b)
|
|
assert.Nil(t, err)
|
|
|
|
c = Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client2",
|
|
}
|
|
|
|
b, err = clients.Add(c)
|
|
assert.True(t, b)
|
|
assert.Nil(t, err)
|
|
|
|
c, b = clients.Find(net.IPv4(1, 1, 1, 1))
|
|
assert.True(t, b)
|
|
assert.Equal(t, c.Name, "client1")
|
|
|
|
c, b = clients.Find(net.ParseIP("1:2:3::4"))
|
|
assert.True(t, b)
|
|
assert.Equal(t, c.Name, "client1")
|
|
|
|
c, b = clients.Find(net.IPv4(2, 2, 2, 2))
|
|
assert.True(t, b)
|
|
assert.Equal(t, c.Name, "client2")
|
|
|
|
assert.False(t, clients.Exists(net.IPv4(1, 2, 3, 4), ClientSourceHostsFile))
|
|
assert.True(t, clients.Exists(net.IPv4(1, 1, 1, 1), ClientSourceHostsFile))
|
|
assert.True(t, clients.Exists(net.IPv4(2, 2, 2, 2), ClientSourceHostsFile))
|
|
})
|
|
|
|
t.Run("add_fail_name", func(t *testing.T) {
|
|
c := Client{
|
|
IDs: []string{"1.2.3.5"},
|
|
Name: "client1",
|
|
}
|
|
|
|
b, err := clients.Add(c)
|
|
assert.False(t, b)
|
|
assert.Nil(t, err)
|
|
})
|
|
|
|
t.Run("add_fail_ip", func(t *testing.T) {
|
|
c := Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client3",
|
|
}
|
|
|
|
b, err := clients.Add(c)
|
|
assert.False(t, b)
|
|
assert.NotNil(t, err)
|
|
})
|
|
|
|
t.Run("update_fail_name", func(t *testing.T) {
|
|
c := Client{
|
|
IDs: []string{"1.2.3.0"},
|
|
Name: "client3",
|
|
}
|
|
|
|
err := clients.Update("client3", c)
|
|
assert.NotNil(t, err)
|
|
|
|
c = Client{
|
|
IDs: []string{"1.2.3.0"},
|
|
Name: "client2",
|
|
}
|
|
|
|
err = clients.Update("client3", c)
|
|
assert.NotNil(t, err)
|
|
})
|
|
|
|
t.Run("update_fail_ip", func(t *testing.T) {
|
|
c := Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client1",
|
|
}
|
|
|
|
err := clients.Update("client1", c)
|
|
assert.NotNil(t, err)
|
|
})
|
|
|
|
t.Run("update_success", func(t *testing.T) {
|
|
c := Client{
|
|
IDs: []string{"1.1.1.2"},
|
|
Name: "client1",
|
|
}
|
|
|
|
err := clients.Update("client1", c)
|
|
assert.Nil(t, err)
|
|
|
|
assert.False(t, clients.Exists(net.IPv4(1, 1, 1, 1), ClientSourceHostsFile))
|
|
assert.True(t, clients.Exists(net.IPv4(1, 1, 1, 2), ClientSourceHostsFile))
|
|
|
|
c = Client{
|
|
IDs: []string{"1.1.1.2"},
|
|
Name: "client1-renamed",
|
|
UseOwnSettings: true,
|
|
}
|
|
|
|
err = clients.Update("client1", c)
|
|
assert.Nil(t, err)
|
|
|
|
c, b := clients.Find(net.IPv4(1, 1, 1, 2))
|
|
assert.True(t, b)
|
|
assert.Equal(t, "client1-renamed", c.Name)
|
|
assert.Equal(t, "1.1.1.2", c.IDs[0])
|
|
assert.True(t, c.UseOwnSettings)
|
|
assert.Nil(t, clients.list["client1"])
|
|
})
|
|
|
|
t.Run("del_success", func(t *testing.T) {
|
|
b := clients.Del("client1-renamed")
|
|
assert.True(t, b)
|
|
assert.False(t, clients.Exists(net.IPv4(1, 1, 1, 2), ClientSourceHostsFile))
|
|
})
|
|
|
|
t.Run("del_fail", func(t *testing.T) {
|
|
b := clients.Del("client3")
|
|
assert.False(t, b)
|
|
})
|
|
|
|
t.Run("addhost_success", func(t *testing.T) {
|
|
b, err := clients.AddHost("1.1.1.1", "host", ClientSourceARP)
|
|
assert.True(t, b)
|
|
assert.Nil(t, err)
|
|
|
|
b, err = clients.AddHost("1.1.1.1", "host2", ClientSourceARP)
|
|
assert.True(t, b)
|
|
assert.Nil(t, err)
|
|
|
|
b, err = clients.AddHost("1.1.1.1", "host3", ClientSourceHostsFile)
|
|
assert.True(t, b)
|
|
assert.Nil(t, err)
|
|
|
|
assert.True(t, clients.Exists(net.IPv4(1, 1, 1, 1), ClientSourceHostsFile))
|
|
})
|
|
|
|
t.Run("addhost_fail", func(t *testing.T) {
|
|
b, err := clients.AddHost("1.1.1.1", "host1", ClientSourceRDNS)
|
|
assert.False(t, b)
|
|
assert.Nil(t, err)
|
|
})
|
|
}
|
|
|
|
func TestClientsWhois(t *testing.T) {
|
|
var c Client
|
|
clients := clientsContainer{}
|
|
clients.testing = true
|
|
clients.Init(nil, nil, nil)
|
|
|
|
whois := [][]string{{"orgname", "orgname-val"}, {"country", "country-val"}}
|
|
// set whois info on new client
|
|
clients.SetWhoisInfo(net.IPv4(1, 1, 1, 255), whois)
|
|
assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.255"].WhoisInfo[0][1])
|
|
|
|
// set whois info on existing auto-client
|
|
_, _ = clients.AddHost("1.1.1.1", "host", ClientSourceRDNS)
|
|
clients.SetWhoisInfo(net.IPv4(1, 1, 1, 1), whois)
|
|
assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.1"].WhoisInfo[0][1])
|
|
|
|
// Check that we cannot set whois info on a manually-added client
|
|
c = Client{
|
|
IDs: []string{"1.1.1.2"},
|
|
Name: "client1",
|
|
}
|
|
_, _ = clients.Add(c)
|
|
clients.SetWhoisInfo(net.IPv4(1, 1, 1, 2), whois)
|
|
assert.Nil(t, clients.ipHost["1.1.1.2"])
|
|
_ = clients.Del("client1")
|
|
}
|
|
|
|
func TestClientsAddExisting(t *testing.T) {
|
|
var c Client
|
|
clients := clientsContainer{}
|
|
clients.testing = true
|
|
clients.Init(nil, nil, nil)
|
|
|
|
// some test variables
|
|
mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
|
|
testIP := "1.2.3.4"
|
|
|
|
// add a client
|
|
c = Client{
|
|
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
|
|
Name: "client1",
|
|
}
|
|
ok, err := clients.Add(c)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
|
|
// add an auto-client with the same IP - it's allowed
|
|
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
|
|
// now some more complicated stuff
|
|
// first, init a DHCP server with a single static lease
|
|
config := dhcpd.ServerConfig{
|
|
DBFilePath: "leases.db",
|
|
}
|
|
defer func() { _ = os.Remove("leases.db") }()
|
|
clients.dhcpServer = dhcpd.Create(config)
|
|
err = clients.dhcpServer.AddStaticLease(dhcpd.Lease{
|
|
HWAddr: mac,
|
|
IP: net.ParseIP(testIP).To4(),
|
|
Hostname: "testhost",
|
|
Expiry: time.Now().Add(time.Hour),
|
|
})
|
|
assert.Nil(t, err)
|
|
|
|
// add a new client with the same IP as for a client with MAC
|
|
c = Client{
|
|
IDs: []string{testIP},
|
|
Name: "client2",
|
|
}
|
|
ok, err = clients.Add(c)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
|
|
// add a new client with the IP from the client1's IP range
|
|
c = Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client3",
|
|
}
|
|
ok, err = clients.Add(c)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
}
|
|
|
|
func TestClientsCustomUpstream(t *testing.T) {
|
|
clients := clientsContainer{}
|
|
clients.testing = true
|
|
|
|
clients.Init(nil, nil, nil)
|
|
|
|
// add client with upstreams
|
|
client := 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",
|
|
},
|
|
}
|
|
ok, err := clients.Add(client)
|
|
assert.Nil(t, err)
|
|
assert.True(t, ok)
|
|
|
|
config := clients.FindUpstreams("1.2.3.4")
|
|
assert.Nil(t, config)
|
|
|
|
config = clients.FindUpstreams("1.1.1.1")
|
|
assert.NotNil(t, config)
|
|
assert.Len(t, config.Upstreams, 1)
|
|
assert.Len(t, config.DomainReservedUpstreams, 1)
|
|
}
|