mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-24 22:15:45 +03:00
31c3d7d302
Squashed commit of the following:
commit 1f99640f9f0a24ade7d2325737edf83ad0da3895
Merge: 5a9211e8c 9276afd79
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 27 13:13:03 2024 +0300
Merge branch 'master' into AG-27492-client-persistent-index
commit 5a9211e8c7832700ae4f58cea25ad38ccba98efa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 22 19:08:35 2024 +0300
all: add todo
commit a4fc94904b0b05ed5ca5ba270125a7d7fb1e6817
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 21 14:48:33 2024 +0300
all: client persistent index
190 lines
5.1 KiB
Go
190 lines
5.1 KiB
Go
package home
|
|
|
|
import (
|
|
"net/netip"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/client"
|
|
"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})
|
|
|
|
// newIDIndex is a helper function that returns a client index filled with
|
|
// persistent clients from the m. It also generates a UID for each client.
|
|
func newIDIndex(m []*client.Persistent) (ci *client.Index) {
|
|
ci = client.NewIndex()
|
|
|
|
for _, c := range m {
|
|
c.UID = client.MustNewUID()
|
|
ci.Add(c)
|
|
}
|
|
|
|
return ci
|
|
}
|
|
|
|
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.clientIndex = newIDIndex([]*client.Persistent{{
|
|
ClientIDs: []string{"default"},
|
|
UseOwnSettings: false,
|
|
SafeSearchConf: filtering.SafeSearchConfig{Enabled: false},
|
|
FilteringEnabled: false,
|
|
SafeBrowsingEnabled: false,
|
|
ParentalEnabled: false,
|
|
}, {
|
|
ClientIDs: []string{"custom_filtering"},
|
|
UseOwnSettings: true,
|
|
SafeSearchConf: filtering.SafeSearchConfig{Enabled: true},
|
|
FilteringEnabled: true,
|
|
SafeBrowsingEnabled: true,
|
|
ParentalEnabled: true,
|
|
}, {
|
|
ClientIDs: []string{"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.clientIndex = newIDIndex([]*client.Persistent{{
|
|
ClientIDs: []string{"default"},
|
|
UseOwnBlockedServices: false,
|
|
}, {
|
|
ClientIDs: []string{"no_services"},
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.EmptyWeekly(),
|
|
},
|
|
UseOwnBlockedServices: true,
|
|
}, {
|
|
ClientIDs: []string{"services"},
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.EmptyWeekly(),
|
|
IDs: clientBlockedServices,
|
|
},
|
|
UseOwnBlockedServices: true,
|
|
}, {
|
|
ClientIDs: []string{"invalid_services"},
|
|
BlockedServices: &filtering.BlockedServices{
|
|
Schedule: schedule.EmptyWeekly(),
|
|
IDs: invalidBlockedServices,
|
|
},
|
|
UseOwnBlockedServices: true,
|
|
}, {
|
|
ClientIDs: []string{"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)
|
|
})
|
|
}
|
|
}
|