mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-26 06:55:48 +03:00
e8c1f5c8d3
Merge in DNS/adguard-home from 2508-ip-conversion to master Updates #2508. Squashed commit of the following: commit 3f64709fbc73ef74c11b910997be1e9bc337193c Merge: 5ac7faaaa0d67aa251Author: 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: db992a42abba74859eAuthor: 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
74 lines
2 KiB
Go
74 lines
2 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestIsBlockedIPAllowed(t *testing.T) {
|
|
a := &accessCtx{}
|
|
assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil))
|
|
|
|
disallowed, disallowedRule := a.IsBlockedIP("1.1.1.1")
|
|
assert.False(t, disallowed)
|
|
assert.Empty(t, disallowedRule)
|
|
|
|
disallowed, disallowedRule = a.IsBlockedIP("1.1.1.2")
|
|
assert.True(t, disallowed)
|
|
assert.Empty(t, disallowedRule)
|
|
|
|
disallowed, disallowedRule = a.IsBlockedIP("2.2.1.1")
|
|
assert.False(t, disallowed)
|
|
assert.Empty(t, disallowedRule)
|
|
|
|
disallowed, disallowedRule = a.IsBlockedIP("2.3.1.1")
|
|
assert.True(t, disallowed)
|
|
assert.Empty(t, disallowedRule)
|
|
}
|
|
|
|
func TestIsBlockedIPDisallowed(t *testing.T) {
|
|
a := &accessCtx{}
|
|
assert.Nil(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil))
|
|
|
|
disallowed, disallowedRule := a.IsBlockedIP("1.1.1.1")
|
|
assert.True(t, disallowed)
|
|
assert.Equal(t, "1.1.1.1", disallowedRule)
|
|
|
|
disallowed, disallowedRule = a.IsBlockedIP("1.1.1.2")
|
|
assert.False(t, disallowed)
|
|
assert.Empty(t, disallowedRule)
|
|
|
|
disallowed, disallowedRule = a.IsBlockedIP("2.2.1.1")
|
|
assert.True(t, disallowed)
|
|
assert.Equal(t, "2.2.0.0/16", disallowedRule)
|
|
|
|
disallowed, disallowedRule = a.IsBlockedIP("2.3.1.1")
|
|
assert.False(t, disallowed)
|
|
assert.Empty(t, disallowedRule)
|
|
}
|
|
|
|
func TestIsBlockedIPBlockedDomain(t *testing.T) {
|
|
a := &accessCtx{}
|
|
assert.True(t, a.Init(nil, nil, []string{
|
|
"host1",
|
|
"host2",
|
|
"*.host.com",
|
|
"||host3.com^",
|
|
}) == nil)
|
|
|
|
// match by "host2.com"
|
|
assert.True(t, a.IsBlockedDomain("host1"))
|
|
assert.True(t, a.IsBlockedDomain("host2"))
|
|
assert.False(t, a.IsBlockedDomain("host3"))
|
|
|
|
// match by wildcard "*.host.com"
|
|
assert.False(t, a.IsBlockedDomain("host.com"))
|
|
assert.True(t, a.IsBlockedDomain("asdf.host.com"))
|
|
assert.True(t, a.IsBlockedDomain("qwer.asdf.host.com"))
|
|
assert.False(t, a.IsBlockedDomain("asdf.zhost.com"))
|
|
|
|
// match by wildcard "||host3.com^"
|
|
assert.True(t, a.IsBlockedDomain("host3.com"))
|
|
assert.True(t, a.IsBlockedDomain("asdf.host3.com"))
|
|
}
|