mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-15 11:22:49 +03:00
d88181343c
Updates #951. Squashed commit of the following: commit 94e4766932940a99c5265489bccb46d0ed6cec25 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jun 27 17:21:41 2023 +0300 chlog: upd docs commit b4022c33860c258bf29650413f0c972b849a1758 Merge: cfa24ff01e7e638443
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jun 27 16:33:20 2023 +0300 Merge branch 'master' into 951-blocked-services-client-schedule commit cfa24ff0190b2bc12736700eeff815525fbaf5fe Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jun 27 15:04:10 2023 +0300 chlog: imp docs commit dad27590d5eefde82758d58fc06a20c139492db8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Jun 26 17:38:08 2023 +0300 home: imp err msg commit 7d9ba98c4477000fc2e0f06c3462fe9cd0c65293 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Jun 26 16:58:00 2023 +0300 all: add tests commit 8e952fc4e3b3d433b29efe47c88d6b7806e99ff8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jun 23 16:36:10 2023 +0300 schedule: add todo commit 723573a98d5b930334a5fa125eb12593f4a2430d Merge: 2151ab2a6e54fc9b1e
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jun 23 11:40:03 2023 +0300 Merge branch 'master' into 951-blocked-services-client-schedule commit 2151ab2a627b9833ba6cce9621f72b29d326da75 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jun 23 11:37:49 2023 +0300 all: add tests commit 81ab341db3e4053f09b181d8111c0da197bdac05 Merge: aa7ae41a866345e855
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 22 17:59:01 2023 +0300 Merge branch 'master' into 951-blocked-services-client-schedule commit aa7ae41a868045fe24e390b25f15551fd8821529 Merge: 304389a4806d465b0d
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 21 17:10:11 2023 +0300 Merge branch 'master' into 951-blocked-services-client-schedule commit 304389a487f728e8ced293ea811a4e0026a37f0d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 21 17:05:31 2023 +0300 home: imp err msg commit 29cfc7ae2a0bbd5ec3205eae3f6f810519787f26 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jun 20 20:42:59 2023 +0300 all: imp err handling commit 8543868eef6442fd30131d9567b66222999101e9 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jun 20 18:21:50 2023 +0300 all: upd chlog commit c5b614d45e5cf25c30c52343f48139fb34c77539 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jun 20 14:37:47 2023 +0300 all: add blocked services schedule
153 lines
3.7 KiB
Go
153 lines
3.7 KiB
Go
package filtering
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/schedule"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/urlfilter/rules"
|
|
"golang.org/x/exp/slices"
|
|
)
|
|
|
|
// serviceRules maps a service ID to its filtering rules.
|
|
var serviceRules map[string][]*rules.NetworkRule
|
|
|
|
// serviceIDs contains service IDs sorted alphabetically.
|
|
var serviceIDs []string
|
|
|
|
// initBlockedServices initializes package-level blocked service data.
|
|
func initBlockedServices() {
|
|
l := len(blockedServices)
|
|
serviceIDs = make([]string, l)
|
|
serviceRules = make(map[string][]*rules.NetworkRule, l)
|
|
|
|
for i, s := range blockedServices {
|
|
netRules := make([]*rules.NetworkRule, 0, len(s.Rules))
|
|
for _, text := range s.Rules {
|
|
rule, err := rules.NewNetworkRule(text, BlockedSvcsListID)
|
|
if err != nil {
|
|
log.Error("parsing blocked service %q rule %q: %s", s.ID, text, err)
|
|
|
|
continue
|
|
}
|
|
|
|
netRules = append(netRules, rule)
|
|
}
|
|
|
|
serviceIDs[i] = s.ID
|
|
serviceRules[s.ID] = netRules
|
|
}
|
|
|
|
slices.Sort(serviceIDs)
|
|
|
|
log.Debug("filtering: initialized %d services", l)
|
|
}
|
|
|
|
// BlockedServices is the configuration of blocked services.
|
|
type BlockedServices struct {
|
|
// Schedule is blocked services schedule for every day of the week.
|
|
Schedule *schedule.Weekly `yaml:"schedule"`
|
|
|
|
// IDs is the names of blocked services.
|
|
IDs []string `yaml:"ids"`
|
|
}
|
|
|
|
// Clone returns a deep copy of blocked services.
|
|
func (s *BlockedServices) Clone() (c *BlockedServices) {
|
|
if s == nil {
|
|
return nil
|
|
}
|
|
|
|
return &BlockedServices{
|
|
Schedule: s.Schedule.Clone(),
|
|
IDs: slices.Clone(s.IDs),
|
|
}
|
|
}
|
|
|
|
// Validate returns an error if blocked services contain unknown service ID. s
|
|
// must not be nil.
|
|
func (s *BlockedServices) Validate() (err error) {
|
|
for _, id := range s.IDs {
|
|
_, ok := serviceRules[id]
|
|
if !ok {
|
|
return fmt.Errorf("unknown blocked-service %q", id)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// ApplyBlockedServices - set blocked services settings for this DNS request
|
|
func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
|
|
d.confLock.RLock()
|
|
defer d.confLock.RUnlock()
|
|
|
|
setts.ServicesRules = []ServiceEntry{}
|
|
|
|
bsvc := d.BlockedServices
|
|
|
|
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
|
|
if !bsvc.Schedule.Contains(time.Now()) {
|
|
d.ApplyBlockedServicesList(setts, bsvc.IDs)
|
|
}
|
|
}
|
|
|
|
// ApplyBlockedServicesList appends filtering rules to the settings.
|
|
func (d *DNSFilter) ApplyBlockedServicesList(setts *Settings, list []string) {
|
|
for _, name := range list {
|
|
rules, ok := serviceRules[name]
|
|
if !ok {
|
|
log.Error("unknown service name: %s", name)
|
|
|
|
continue
|
|
}
|
|
|
|
setts.ServicesRules = append(setts.ServicesRules, ServiceEntry{
|
|
Name: name,
|
|
Rules: rules,
|
|
})
|
|
}
|
|
}
|
|
|
|
func (d *DNSFilter) handleBlockedServicesIDs(w http.ResponseWriter, r *http.Request) {
|
|
_ = aghhttp.WriteJSONResponse(w, r, serviceIDs)
|
|
}
|
|
|
|
func (d *DNSFilter) handleBlockedServicesAll(w http.ResponseWriter, r *http.Request) {
|
|
_ = aghhttp.WriteJSONResponse(w, r, struct {
|
|
BlockedServices []blockedService `json:"blocked_services"`
|
|
}{
|
|
BlockedServices: blockedServices,
|
|
})
|
|
}
|
|
|
|
func (d *DNSFilter) handleBlockedServicesList(w http.ResponseWriter, r *http.Request) {
|
|
d.confLock.RLock()
|
|
list := d.Config.BlockedServices.IDs
|
|
d.confLock.RUnlock()
|
|
|
|
_ = aghhttp.WriteJSONResponse(w, r, list)
|
|
}
|
|
|
|
func (d *DNSFilter) handleBlockedServicesSet(w http.ResponseWriter, r *http.Request) {
|
|
list := []string{}
|
|
err := json.NewDecoder(r.Body).Decode(&list)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
d.confLock.Lock()
|
|
d.Config.BlockedServices.IDs = list
|
|
d.confLock.Unlock()
|
|
|
|
log.Debug("Updated blocked services list: %d", len(list))
|
|
|
|
d.Config.ConfigModified()
|
|
}
|