e8c1f5c8d3
Merge in DNS/adguard-home from 2508-ip-conversion to master Updates #2508. Squashed commit of the following: commit 3f64709fbc73ef74c11b910997be1e9bc337193c Merge: 5ac7faaaa0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 16:21:34 2021 +0300 Merge branch 'master' into 2508-ip-conversion commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 12:00:11 2021 +0300 all: replace conditions with appropriate functions in tests commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71 Merge: db992a42abba74859e
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 10:47:10 2021 +0300 Merge branch 'master' into 2508-ip-conversion commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 18:55:53 2021 +0300 sysutil: fix linux tests commit f629b15d62349323ce2da05e68dc9cc0b5f6e194 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 18:41:20 2021 +0300 all: improve code quality commit 3bf03a75524040738562298bd1de6db536af130f Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 17:33:26 2021 +0300 sysutil: fix linux net.IP conversion commit 5d5b6994916923636e635588631b63b7e7b74e5f Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 14:57:26 2021 +0300 dnsforward: remove redundant net.IP <-> string conversion commit 0b955d99b7fad40942f21d1dd8734adb99126195 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 11 18:04:25 2021 +0300 dhcpd: remove net.IP <-> string conversion
281 lines
6.3 KiB
Go
281 lines
6.3 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("1.1.1.1")
|
|
assert.True(t, b)
|
|
assert.Equal(t, c.Name, "client1")
|
|
|
|
c, b = clients.Find("1:2:3::4")
|
|
assert.True(t, b)
|
|
assert.Equal(t, c.Name, "client1")
|
|
|
|
c, b = clients.Find("2.2.2.2")
|
|
assert.True(t, b)
|
|
assert.Equal(t, c.Name, "client2")
|
|
|
|
assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile))
|
|
assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
|
|
assert.True(t, clients.Exists("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("1.1.1.1", ClientSourceHostsFile))
|
|
assert.True(t, clients.Exists("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("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("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("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("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("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("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)
|
|
}
|