mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-23 07:10:21 +03:00
28cfde9212
Merge in DNS/adguard-home from upd-urlfilter to master Updates #6050. Squashed commit of the following: commit 80337ab02d616e25fa455e46c9535c088b5c5ea5 Merge: fb2cfd1a531f7aaecc
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 23 16:50:49 2023 +0300 Merge branch 'master' into upd-urlfilter commit fb2cfd1a5c94d92030fc8832615764f100d010e5 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 23 16:22:43 2023 +0300 dnsforward: imp code, docs commit 2900333bb85d4e064db9de27bd5bfe7c3ef00747 Merge: 977ed35e42bfc9fcb1
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 18:06:05 2023 +0300 Merge branch 'master' into upd-urlfilter commit 977ed35e4ed377f1031721d58e0fcb58de1e74ac Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 17:06:30 2023 +0300 all: log changes commit 1228a0770485799bf50bbe68005dbb0ba9a96a9c Merge: 78305eb2e4b4036fa6
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:51:42 2023 +0300 Merge branch 'master' into upd-urlfilter commit 78305eb2ebc3854dd11ce35d6b4c7eecccd7cc78 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 15:55:05 2023 +0300 all: upd urlfilter commit 63a29e18d5034e5f9433121ff7e7c45aebfa1f0f Merge: 748c53430762e5be97
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 20:12:49 2023 +0300 Merge branch 'master' into upd-urlfilter commit 748c5343020b0c6d4d4f16eb3d30b875c0a94e0f Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 20:07:44 2023 +0300 all: imp code, docs commit 91975140f3305a6793e07142f7c9a75120a4ce8c Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 16:16:19 2023 +0300 all: upd urlfilter
178 lines
4.5 KiB
Go
178 lines
4.5 KiB
Go
package home
|
|
|
|
import (
|
|
"net/netip"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/schedule"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
var testIPv4 = netip.AddrFrom4([4]byte{1, 2, 3, 4})
|
|
|
|
func TestApplyAdditionalFiltering(t *testing.T) {
|
|
var err error
|
|
|
|
Context.filters, err = filtering.New(&filtering.Config{
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.EmptyWeekly(),
|
|
},
|
|
}, nil)
|
|
require.NoError(t, err)
|
|
|
|
Context.clients.idIndex = map[string]*Client{
|
|
"default": {
|
|
UseOwnSettings: false,
|
|
safeSearchConf: filtering.SafeSearchConfig{Enabled: false},
|
|
FilteringEnabled: false,
|
|
SafeBrowsingEnabled: false,
|
|
ParentalEnabled: false,
|
|
},
|
|
"custom_filtering": {
|
|
UseOwnSettings: true,
|
|
safeSearchConf: filtering.SafeSearchConfig{Enabled: true},
|
|
FilteringEnabled: true,
|
|
SafeBrowsingEnabled: true,
|
|
ParentalEnabled: true,
|
|
},
|
|
"partial_custom_filtering": {
|
|
UseOwnSettings: true,
|
|
safeSearchConf: filtering.SafeSearchConfig{Enabled: true},
|
|
FilteringEnabled: true,
|
|
SafeBrowsingEnabled: false,
|
|
ParentalEnabled: false,
|
|
},
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
id string
|
|
FilteringEnabled assert.BoolAssertionFunc
|
|
SafeSearchEnabled assert.BoolAssertionFunc
|
|
SafeBrowsingEnabled assert.BoolAssertionFunc
|
|
ParentalEnabled assert.BoolAssertionFunc
|
|
}{{
|
|
name: "global_settings",
|
|
id: "default",
|
|
FilteringEnabled: assert.False,
|
|
SafeSearchEnabled: assert.False,
|
|
SafeBrowsingEnabled: assert.False,
|
|
ParentalEnabled: assert.False,
|
|
}, {
|
|
name: "custom_settings",
|
|
id: "custom_filtering",
|
|
FilteringEnabled: assert.True,
|
|
SafeSearchEnabled: assert.True,
|
|
SafeBrowsingEnabled: assert.True,
|
|
ParentalEnabled: assert.True,
|
|
}, {
|
|
name: "partial",
|
|
id: "partial_custom_filtering",
|
|
FilteringEnabled: assert.True,
|
|
SafeSearchEnabled: assert.True,
|
|
SafeBrowsingEnabled: assert.False,
|
|
ParentalEnabled: assert.False,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
setts := &filtering.Settings{}
|
|
|
|
applyAdditionalFiltering(testIPv4, tc.id, setts)
|
|
tc.FilteringEnabled(t, setts.FilteringEnabled)
|
|
tc.SafeSearchEnabled(t, setts.SafeSearchEnabled)
|
|
tc.SafeBrowsingEnabled(t, setts.SafeBrowsingEnabled)
|
|
tc.ParentalEnabled(t, setts.ParentalEnabled)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestApplyAdditionalFiltering_blockedServices(t *testing.T) {
|
|
filtering.InitModule()
|
|
|
|
var (
|
|
globalBlockedServices = []string{"ok"}
|
|
clientBlockedServices = []string{"ok", "mail_ru", "vk"}
|
|
invalidBlockedServices = []string{"invalid"}
|
|
|
|
err error
|
|
)
|
|
|
|
Context.filters, err = filtering.New(&filtering.Config{
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.EmptyWeekly(),
|
|
IDs: globalBlockedServices,
|
|
},
|
|
}, nil)
|
|
require.NoError(t, err)
|
|
|
|
Context.clients.idIndex = map[string]*Client{
|
|
"default": {
|
|
UseOwnBlockedServices: false,
|
|
},
|
|
"no_services": {
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.EmptyWeekly(),
|
|
},
|
|
UseOwnBlockedServices: true,
|
|
},
|
|
"services": {
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.EmptyWeekly(),
|
|
IDs: clientBlockedServices,
|
|
},
|
|
UseOwnBlockedServices: true,
|
|
},
|
|
"invalid_services": {
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.EmptyWeekly(),
|
|
IDs: invalidBlockedServices,
|
|
},
|
|
UseOwnBlockedServices: true,
|
|
},
|
|
"allow_all": {
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.FullWeekly(),
|
|
IDs: clientBlockedServices,
|
|
},
|
|
UseOwnBlockedServices: true,
|
|
},
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
id string
|
|
wantLen int
|
|
}{{
|
|
name: "global_settings",
|
|
id: "default",
|
|
wantLen: len(globalBlockedServices),
|
|
}, {
|
|
name: "custom_settings",
|
|
id: "no_services",
|
|
wantLen: 0,
|
|
}, {
|
|
name: "custom_settings_block",
|
|
id: "services",
|
|
wantLen: len(clientBlockedServices),
|
|
}, {
|
|
name: "custom_settings_invalid",
|
|
id: "invalid_services",
|
|
wantLen: 0,
|
|
}, {
|
|
name: "custom_settings_inactive_schedule",
|
|
id: "allow_all",
|
|
wantLen: 0,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
setts := &filtering.Settings{}
|
|
|
|
applyAdditionalFiltering(testIPv4, tc.id, setts)
|
|
require.Len(t, setts.ServicesRules, tc.wantLen)
|
|
})
|
|
}
|
|
}
|