mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 13:05:36 +03:00
3a67cc2c45
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package
121 lines
2.7 KiB
Go
121 lines
2.7 KiB
Go
// +build linux
|
|
|
|
package aghnet
|
|
|
|
import (
|
|
"bytes"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
const nl = "\n"
|
|
|
|
func TestDHCPCDStaticConfig(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
data []byte
|
|
want bool
|
|
}{{
|
|
name: "has_not",
|
|
data: []byte(`#comment` + nl +
|
|
`# comment` + nl +
|
|
`interface eth0` + nl +
|
|
`static ip_address=192.168.0.1/24` + nl +
|
|
`# interface wlan0` + nl +
|
|
`static ip_address=192.168.1.1/24` + nl +
|
|
`# comment` + nl,
|
|
),
|
|
want: false,
|
|
}, {
|
|
name: "has",
|
|
data: []byte(`#comment` + nl +
|
|
`# comment` + nl +
|
|
`interface eth0` + nl +
|
|
`static ip_address=192.168.0.1/24` + nl +
|
|
`# interface wlan0` + nl +
|
|
`static ip_address=192.168.1.1/24` + nl +
|
|
`# comment` + nl +
|
|
`interface wlan0` + nl +
|
|
`# comment` + nl +
|
|
`static ip_address=192.168.2.1/24` + nl,
|
|
),
|
|
want: true,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
r := bytes.NewReader(tc.data)
|
|
has, err := dhcpcdStaticConfig(r, "wlan0")
|
|
require.Nil(t, err)
|
|
assert.Equal(t, tc.want, has)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIfacesStaticConfig(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
data []byte
|
|
want bool
|
|
}{{
|
|
name: "has_not",
|
|
data: []byte(`allow-hotplug enp0s3` + 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 enp0s3 inet dhcp` + nl,
|
|
),
|
|
want: false,
|
|
}, {
|
|
name: "has",
|
|
data: []byte(`allow-hotplug enp0s3` + 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 enp0s3 inet dhcp` + nl,
|
|
),
|
|
want: true,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
r := bytes.NewReader(tc.data)
|
|
has, err := ifacesStaticConfig(r, "enp0s3")
|
|
require.Nil(t, err)
|
|
assert.Equal(t, tc.want, has)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSetStaticIPdhcpcdConf(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
dhcpcdConf string
|
|
routers net.IP
|
|
}{{
|
|
name: "with_gateway",
|
|
dhcpcdConf: 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 + `interface wlan0` + nl +
|
|
`static ip_address=192.168.0.2/24` + nl +
|
|
`static domain_name_servers=192.168.0.2` + nl + nl,
|
|
routers: nil,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
|
|
assert.Equal(t, tc.dhcpcdConf, s)
|
|
})
|
|
}
|
|
}
|