Merge in DNS/adguard-home from 951-blocked-services-schedule to master Squashed commit of the following: commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8 Merge: 2705fbcfb7309a5335Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 14 15:00:56 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 14 14:56:01 2023 +0300 schedule: imp field alignment commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d Merge: f99936f369fda7bfd3Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jun 13 11:49:15 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule commit f99936f36be3453b50d772ce10bfdc1ad14879c5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jun 9 19:14:06 2023 +0300 schedule: add tests commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 8 20:10:03 2023 +0300 schedule: imp code commit 850a3d93e659e0584bd449cf5af3f13b36be9e62 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 8 18:57:23 2023 +0300 schedule: imp tests commit d54c42b782a4a806d2f35abbea1826ba6394a64c Merge: 21dfa51ea156c199bbAuthor: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 8 18:12:03 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 8 18:02:47 2023 +0300 all: add todo commit d0d4532c8911fb6365f6af66ceb72a70b158b77d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 7 18:54:44 2023 +0300 all: upd chlog commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 7 17:34:28 2023 +0300 all: add tests commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 7 13:20:00 2023 +0300 all: add schedule pkg commit e0bcad0193a559a89f5f5052f5a985fa730d23be Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jun 2 13:03:04 2023 +0300 filtering: add test case commit da7a7c20c84151ff83414cb5d576a91740a1be7e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed May 31 15:31:48 2023 +0300 filtering: imp code commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 29 17:46:24 2023 +0300 filtering: add type check commit f4bcea8ad90d584ceff236ccce4f246e391e0e33 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 29 17:37:25 2023 +0300 all: imp code commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 29 15:20:33 2023 +0300 filtering: imp err msg commit 1befab59cf2a12a3bc8296066ce1115dff5a8843 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 29 14:31:14 2023 +0300 filtering: imp tests commit 09506f924f363f1563009cec0c44ad40d08b8ddd Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri May 26 18:44:12 2023 +0300 filtering: add tests commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri May 26 17:57:01 2023 +0300 all: fix typos commit 69399cd3ea17691ff0848baf43ff09b18b82114c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu May 25 18:50:51 2023 +0300 all: upd chlog ... and 2 more commits
134 lines
3.4 KiB
Go
134 lines
3.4 KiB
Go
package filtering
|
|
|
|
import (
|
|
"encoding/json"
|
|
"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"`
|
|
}
|
|
|
|
// BlockedSvcKnown returns true if a blocked service ID is known.
|
|
func BlockedSvcKnown(s string) (ok bool) {
|
|
_, ok = serviceRules[s]
|
|
|
|
return ok
|
|
}
|
|
|
|
// 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()
|
|
}
|