Merge in DNS/adguard-home from AGDNS-2688-check-host to master Squashed commit of the following: commit bd9ed498b0e36fa044e6921fa946062ac40fe616 Merge: 8dffd94a3c41af2763Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Mar 14 13:42:34 2025 +0300 Merge branch 'master' into AGDNS-2688-check-host commit 8dffd94a3bc700cf014cbb16aee9c6339bdc7ffa Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 12 17:12:56 2025 +0300 filtering: imp code commit d9a01c8fa60c70e3fd19c40c1a58aec00ae64a6a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 11 20:33:18 2025 +0300 all: imp code commit f1aca5f2eb71a1d8bb155a309c618e7a80f8fde5 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Mar 11 16:05:32 2025 +0300 ADG-9783 update check form commit a8ebb0401dbaa08fdd04171b1ac66b87d0228c7b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 10 16:41:55 2025 +0300 dnsforward: imp docs commit 36f5db9075cc525c13905e0318dfbc4089355523 Merge: 9a746ee9a66fba942cAuthor: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 10 16:09:22 2025 +0300 Merge branch 'master' into AGDNS-2688-check-host commit 9a746ee9a05895676a60980eb4bd1381fe8d8e4b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 10 16:06:48 2025 +0300 all: imp docs commit 0a25e1e8f3536053e30049497bb42a58c6a153d6 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 6 21:48:44 2025 +0300 all: imp code commit ec618bc484190dde52a0dc57d144bade8dfc22e2 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 6 17:38:35 2025 +0300 all: imp code commit 979c5cfd4c34e2aac46ea11b7fcba8d2929966b8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 5 21:22:54 2025 +0300 all: add tests commit ce0d6117ad7f341edcc018a68acedaa0b718bef1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 4 15:13:06 2025 +0300 all: check host
58 lines
1.9 KiB
Go
58 lines
1.9 KiB
Go
package filtering
|
|
|
|
import "context"
|
|
|
|
// SafeSearch interface describes a service for search engines hosts rewrites.
|
|
//
|
|
// TODO(s.chzhen): Move to a higher-level package to allow importing the client
|
|
// package into the filtering package.
|
|
type SafeSearch interface {
|
|
// CheckHost checks host with safe search filter. CheckHost must be safe
|
|
// for concurrent use. qtype must be either [dns.TypeA] or [dns.TypeAAAA].
|
|
CheckHost(ctx context.Context, host string, qtype uint16) (res Result, err error)
|
|
|
|
// Update updates the configuration of the safe search filter. Update must
|
|
// be safe for concurrent use. An implementation of Update may ignore some
|
|
// fields, but it must document which.
|
|
Update(ctx context.Context, conf SafeSearchConfig) (err error)
|
|
}
|
|
|
|
// SafeSearchConfig is a struct with safe search related settings.
|
|
type SafeSearchConfig struct {
|
|
// Enabled indicates if safe search is enabled entirely.
|
|
Enabled bool `yaml:"enabled" json:"enabled"`
|
|
|
|
// Services flags. Each flag indicates if the corresponding service is
|
|
// enabled or disabled.
|
|
|
|
Bing bool `yaml:"bing" json:"bing"`
|
|
DuckDuckGo bool `yaml:"duckduckgo" json:"duckduckgo"`
|
|
Ecosia bool `yaml:"ecosia" json:"ecosia"`
|
|
Google bool `yaml:"google" json:"google"`
|
|
Pixabay bool `yaml:"pixabay" json:"pixabay"`
|
|
Yandex bool `yaml:"yandex" json:"yandex"`
|
|
YouTube bool `yaml:"youtube" json:"youtube"`
|
|
}
|
|
|
|
// checkSafeSearch checks host with safe search engine. Matches
|
|
// [hostChecker.check].
|
|
func (d *DNSFilter) checkSafeSearch(
|
|
host string,
|
|
qtype uint16,
|
|
setts *Settings,
|
|
) (res Result, err error) {
|
|
if d.safeSearch == nil || !setts.ProtectionEnabled || !setts.SafeSearchEnabled {
|
|
return Result{}, nil
|
|
}
|
|
|
|
// TODO(s.chzhen): Pass context.
|
|
ctx := context.TODO()
|
|
|
|
clientSafeSearch := setts.ClientSafeSearch
|
|
if clientSafeSearch != nil {
|
|
return clientSafeSearch.CheckHost(ctx, host, qtype)
|
|
}
|
|
|
|
return d.safeSearch.CheckHost(ctx, host, qtype)
|
|
}
|