mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 06:25:44 +03:00
94d437d404
Squashed commit of the following: commit 6605cd17a2e5137cf69c853c2a956b2443e81ce9 Merge: 5b294a268bec3cab56
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Dec 28 16:51:39 2023 +0300 Merge branch 'master' into AG-27492-client-persistent commit 5b294a26848e173b26eb9496b3c380b847a9fa1b Merge: afe4d5f16d75712bb9
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Dec 27 19:13:50 2023 +0300 Merge branch 'master' into AG-27492-client-persistent commit afe4d5f1659c474173139ed4c841d72306ed27ac Merge: 05dc0bfdaad147ac7b
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Dec 26 14:59:10 2023 +0300 Merge branch 'master' into AG-27492-client-persistent commit 05dc0bfda2001cececc37c040f0cee632921aae4 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Dec 20 19:44:04 2023 +0300 home: imp err msg commit c3b21c739ccb4436e9606579e3fb46cc32821a81 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Dec 18 15:05:29 2023 +0300 all: imp docs commita2118f5aed
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Dec 15 18:27:50 2023 +0300 all: add persistent client uid
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]*persistentClient{
|
|
"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]*persistentClient{
|
|
"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)
|
|
})
|
|
}
|
|
}
|