mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-17 21:31:43 +03:00
2796e65468
Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master
Updates #2499.
Squashed commit of the following:
commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3
Merge: f49e9186 2b635bf6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 19:23:07 2021 +0300
Merge branch 'master' into 2499-merge-rewrites-vol.1
commit f49e9186ffc8b7074d03c6721ee56cdb09243684
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 18:50:49 2021 +0300
aghos: fix fs events filtering
commit 567dd646556606212af5dab60e3ecbb8fff22c25
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 16:50:37 2021 +0300
all: imp code, docs, fix windows
commit 140c8bf519345eb54d0e7500a996fcf465353d71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 19:41:53 2021 +0300
aghnet: use const
commit bebf3f76bd394a498ccad812c57d4507c69529ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 19:32:37 2021 +0300
all: imp tests, docs
commit 9bfdbb6eb454833135d616e208e82699f98e2562
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 18:42:20 2021 +0300
all: imp path more, imp docs
commit ee9ea4c132a6b17787d150bf2bee703abaa57be3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 16:09:46 2021 +0300
all: fix windows, imp paths
commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 11 19:53:35 2021 +0300
all: imp code, docs
commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 11 18:22:50 2021 +0300
aghnet: fix windows tests
commit d29de359ed68118d71efb226a8433fac15ff5c66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 8 21:02:14 2021 +0300
all: repl & imp
commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 8 01:41:19 2021 +0300
all: add tests, mv logic, added tmpfs
commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 7 14:26:30 2021 +0300
all: imp filewalker, refactor hosts container
156 lines
3.7 KiB
Go
156 lines
3.7 KiB
Go
//go:build linux
|
|
// +build linux
|
|
|
|
package aghnet
|
|
|
|
import (
|
|
"bytes"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestDHCPCDStaticConfig(t *testing.T) {
|
|
const iface interfaceName = `wlan0`
|
|
|
|
testCases := []struct {
|
|
name string
|
|
data []byte
|
|
wantCont bool
|
|
}{{
|
|
name: "has_not",
|
|
data: []byte(`#comment` + nl +
|
|
`# comment` + nl +
|
|
`interface eth0` + nl +
|
|
`static ip_address=192.168.0.1/24` + nl +
|
|
`# interface ` + iface + nl +
|
|
`static ip_address=192.168.1.1/24` + nl +
|
|
`# comment` + nl,
|
|
),
|
|
wantCont: true,
|
|
}, {
|
|
name: "has",
|
|
data: []byte(`#comment` + nl +
|
|
`# comment` + nl +
|
|
`interface eth0` + nl +
|
|
`static ip_address=192.168.0.1/24` + nl +
|
|
`# interface ` + iface + nl +
|
|
`static ip_address=192.168.1.1/24` + nl +
|
|
`# comment` + nl +
|
|
`interface ` + iface + nl +
|
|
`# comment` + nl +
|
|
`static ip_address=192.168.2.1/24` + nl,
|
|
),
|
|
wantCont: false,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
r := bytes.NewReader(tc.data)
|
|
_, cont, err := iface.dhcpcdStaticConfig(r)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, tc.wantCont, cont)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIfacesStaticConfig(t *testing.T) {
|
|
const iface interfaceName = `enp0s3`
|
|
|
|
testCases := []struct {
|
|
name string
|
|
data []byte
|
|
wantCont bool
|
|
wantPatterns []string
|
|
}{{
|
|
name: "has_not",
|
|
data: []byte(`allow-hotplug ` + iface + nl +
|
|
`#iface enp0s3 inet static` + nl +
|
|
`# address 192.168.0.200` + nl +
|
|
`# netmask 255.255.255.0` + nl +
|
|
`# gateway 192.168.0.1` + nl +
|
|
`iface ` + iface + ` inet dhcp` + nl,
|
|
),
|
|
wantCont: true,
|
|
wantPatterns: []string{},
|
|
}, {
|
|
name: "has",
|
|
data: []byte(`allow-hotplug ` + iface + nl +
|
|
`iface ` + iface + ` inet static` + nl +
|
|
` address 192.168.0.200` + nl +
|
|
` netmask 255.255.255.0` + nl +
|
|
` gateway 192.168.0.1` + nl +
|
|
`#iface ` + iface + ` inet dhcp` + nl,
|
|
),
|
|
wantCont: false,
|
|
wantPatterns: []string{},
|
|
}, {
|
|
name: "return_patterns",
|
|
data: []byte(`source hello` + nl +
|
|
`source world` + nl +
|
|
`#iface ` + iface + ` inet static` + nl,
|
|
),
|
|
wantCont: true,
|
|
wantPatterns: []string{"hello", "world"},
|
|
}, {
|
|
// This one tests if the first found valid interface prevents
|
|
// checking files under the `source` directive.
|
|
name: "ignore_patterns",
|
|
data: []byte(`source hello` + nl +
|
|
`source world` + nl +
|
|
`iface ` + iface + ` inet static` + nl,
|
|
),
|
|
wantCont: false,
|
|
wantPatterns: []string{},
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
r := bytes.NewReader(tc.data)
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
patterns, has, err := iface.ifacesStaticConfig(r)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, tc.wantCont, has)
|
|
assert.ElementsMatch(t, tc.wantPatterns, patterns)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSetStaticIPdhcpcdConf(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
dhcpcdConf string
|
|
routers net.IP
|
|
}{{
|
|
name: "with_gateway",
|
|
dhcpcdConf: nl + `# wlan0 added by AdGuard Home.` + nl +
|
|
`interface wlan0` + nl +
|
|
`static ip_address=192.168.0.2/24` + nl +
|
|
`static routers=192.168.0.1` + nl +
|
|
`static domain_name_servers=192.168.0.2` + nl + nl,
|
|
routers: net.IP{192, 168, 0, 1},
|
|
}, {
|
|
name: "without_gateway",
|
|
dhcpcdConf: nl + `# wlan0 added by AdGuard Home.` + nl +
|
|
`interface wlan0` + nl +
|
|
`static ip_address=192.168.0.2/24` + nl +
|
|
`static domain_name_servers=192.168.0.2` + nl + nl,
|
|
routers: nil,
|
|
}}
|
|
|
|
ipNet := &net.IPNet{
|
|
IP: net.IP{192, 168, 0, 2},
|
|
Mask: net.IPMask{255, 255, 255, 0},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
s := dhcpcdConfIface("wlan0", ipNet, tc.routers, net.IP{192, 168, 0, 2})
|
|
assert.Equal(t, tc.dhcpcdConf, s)
|
|
})
|
|
}
|
|
}
|