Squashed commit of the following: commit 85ea3d985e83209e3b49119959aedd330df24d23 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 18 15:19:38 2024 +0200 all: imp docs commit b0695daddbcf191454c5e829ca4d19def8ddacbf Merge: a79f98f2f48c6242a7Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 17 11:06:49 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https # Conflicts: # CHANGELOG.md commit a79f98f2f215a4a79ca4d186c0da33db936429dc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 17 11:05:34 2024 +0200 dnsforward: imp code commit b901a1169cc78313298d70cce770cd1523ccbf9f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 16 11:03:52 2024 +0200 dnsforward: imp code commit fb6e66971b1b984147ec400ceaff856e7b5710c7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 16 10:08:51 2024 +0200 all: safesearch rewrites commit 88add21831fff7e04539f5dd299832883a6f3995 Merge: b78ad8f74201ac73cfAuthor: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 16 09:43:20 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https # Conflicts: # CHANGELOG.md commit b78ad8f748c7fa52533e0541cae16bd51c201370 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Apr 12 13:34:39 2024 +0200 all: safesearch rewrites commit fb3efbb053242c537ca872542006917b8e8ac1ff Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 11 13:15:37 2024 +0200 safesearch: imp code commit 1193c704f4d30be4a2cc66e84a31c9a6020ab269 Merge: 14e823d7cff7c715c5Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 11 13:13:44 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https # Conflicts: # CHANGELOG.md commit 14e823d7cc13c275c2ed04704883a94b95e29963 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 11 13:11:43 2024 +0200 all: safesearch https commit cd403a2897ae56a9059a78f24b104af5805d84ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 11 12:09:27 2024 +0200 Revert "all: safesearch https" This reverts commit 1c9564b9b4db70f85b2f827cc06b65d2b67b08b1. commit 1c9564b9b4db70f85b2f827cc06b65d2b67b08b1 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 10 12:41:47 2024 +0200 all: safesearch https commit 5f42688fbab566973acc8dc414a992819492a9ac Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 10 09:22:30 2024 +0200 filtering: imp code commit eb9bd9f47cd71cafe8eee4698a8a0d5d25dea3d3 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 10 09:19:22 2024 +0200 all: changelog commit 0c77c705a942fe83d3809a7efbc8a6baf5886762 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 10 08:55:22 2024 +0200 safesearch: imp tests commit 492a93fbb5ff54678e22a15577f509b2327c2ebe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 9 14:45:16 2024 +0200 all: changelog commit a665e7246d11503c47d48ccc714e6862f764e930 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 9 14:41:24 2024 +0200 safesearch: https req
49 lines
1.6 KiB
Go
49 lines
1.6 KiB
Go
package filtering
|
|
|
|
// SafeSearch interface describes a service for search engines hosts rewrites.
|
|
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(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(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"`
|
|
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
|
|
}
|
|
|
|
clientSafeSearch := setts.ClientSafeSearch
|
|
if clientSafeSearch != nil {
|
|
return clientSafeSearch.CheckHost(host, qtype)
|
|
}
|
|
|
|
return d.safeSearch.CheckHost(host, qtype)
|
|
}
|