mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 19:08:25 -07:00
fc9ddcf941
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
293 lines
6.7 KiB
Go
293 lines
6.7 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",
|
|
}
|
|
|
|
ok, err := clients.Add(c)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
|
|
c = &Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client2",
|
|
}
|
|
|
|
ok, err = clients.Add(c)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
|
|
c, ok = clients.Find("1.1.1.1")
|
|
assert.True(t, ok)
|
|
assert.Equal(t, "client1", c.Name)
|
|
|
|
c, ok = clients.Find("1:2:3::4")
|
|
assert.True(t, ok)
|
|
assert.Equal(t, "client1", c.Name)
|
|
|
|
c, ok = clients.Find("2.2.2.2")
|
|
assert.True(t, ok)
|
|
assert.Equal(t, "client2", c.Name)
|
|
|
|
assert.True(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",
|
|
}
|
|
|
|
ok, err := clients.Add(c)
|
|
assert.False(t, ok)
|
|
assert.Nil(t, err)
|
|
})
|
|
|
|
t.Run("add_fail_ip", func(t *testing.T) {
|
|
c := &Client{
|
|
IDs: []string{"2.2.2.2"},
|
|
Name: "client3",
|
|
}
|
|
|
|
ok, err := clients.Add(c)
|
|
assert.False(t, ok)
|
|
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.True(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, ok := clients.Find("1.1.1.2")
|
|
assert.True(t, ok)
|
|
assert.Equal(t, "client1-renamed", c.Name)
|
|
assert.True(t, c.UseOwnSettings)
|
|
assert.Nil(t, clients.list["client1"])
|
|
if assert.Len(t, c.IDs, 1) {
|
|
assert.Equal(t, "1.1.1.2", c.IDs[0])
|
|
}
|
|
})
|
|
|
|
t.Run("del_success", func(t *testing.T) {
|
|
ok := clients.Del("client1-renamed")
|
|
assert.True(t, ok)
|
|
assert.False(t, clients.Exists("1.1.1.2", ClientSourceHostsFile))
|
|
})
|
|
|
|
t.Run("del_fail", func(t *testing.T) {
|
|
ok := clients.Del("client3")
|
|
assert.False(t, ok)
|
|
})
|
|
|
|
t.Run("addhost_success", func(t *testing.T) {
|
|
ok, err := clients.AddHost("1.1.1.1", "host", ClientSourceARP)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
|
|
ok, err = clients.AddHost("1.1.1.1", "host2", ClientSourceARP)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
|
|
ok, err = clients.AddHost("1.1.1.1", "host3", ClientSourceHostsFile)
|
|
assert.True(t, ok)
|
|
assert.Nil(t, err)
|
|
|
|
assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
|
|
})
|
|
|
|
t.Run("addhost_fail", func(t *testing.T) {
|
|
ok, err := clients.AddHost("1.1.1.1", "host1", ClientSourceRDNS)
|
|
assert.False(t, ok)
|
|
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)
|
|
if assert.NotNil(t, clients.ipHost["1.1.1.255"]) {
|
|
h := clients.ipHost["1.1.1.255"]
|
|
if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
|
|
assert.Equal(t, "orgname-val", h.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)
|
|
if assert.NotNil(t, clients.ipHost["1.1.1.1"]) {
|
|
h := clients.ipHost["1.1.1.1"]
|
|
if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
|
|
assert.Equal(t, "orgname-val", h.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
|
|
c := &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(c)
|
|
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.Equal(t, 1, len(config.Upstreams))
|
|
assert.Equal(t, 1, len(config.DomainReservedUpstreams))
|
|
}
|