mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-21 20:45:33 +03:00
Pull request: 5009-ecosia-safesearch
Squashed commit of the following: commit787b5d4039Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 31 15:09:18 2024 +0300 configmigrate: revert commita036638c05Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 31 09:37:25 2024 +0300 docs commita3b2e8de4bAuthor: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 31 09:18:25 2024 +0300 locales commita01a22019eAuthor: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 31 09:02:14 2024 +0300 filtering: imp code commitbc268cdd52Merge:5ad88d914bc6d20ff1Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 31 08:00:05 2024 +0300 Merge remote-tracking branch 'origin/master' into 5009-ecosia-safesearch commit5ad88d914cAuthor: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Jul 30 13:49:51 2024 +0300 all: ecosia safesearch
This commit is contained in:
Dimitry Kolyshev
parent
bc6d20ff10
commit
b6ed769652
12 changed files with 29 additions and 1 deletions
|
|
@ -27,12 +27,17 @@ See also the [v0.107.53 GitHub milestone][ms-v0.107.53].
|
|||
NOTE: Add new changes BELOW THIS COMMENT.
|
||||
-->
|
||||
|
||||
### Added
|
||||
|
||||
- Ecosia search engine is now supported in safe search ([#5009]).
|
||||
|
||||
### Fixed
|
||||
|
||||
- Update Google safe search domains list ([#7155]).
|
||||
- Enforce Bing safe search from Edge sidebar ([#7154]).
|
||||
- Text overflow on the query log page ([#7119]).
|
||||
|
||||
[#5009]: https://github.com/AdguardTeam/AdGuardHome/issues/5009
|
||||
[#7119]: https://github.com/AdguardTeam/AdGuardHome/issues/7119
|
||||
[#7154]: https://github.com/AdguardTeam/AdGuardHome/pull/7154
|
||||
[#7155]: https://github.com/AdguardTeam/AdGuardHome/pull/7155
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@
|
|||
"use_adguard_parental": "Use AdGuard parental control web service",
|
||||
"use_adguard_parental_hint": "AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.",
|
||||
"enforce_safe_search": "Use Safe Search",
|
||||
"enforce_save_search_hint": "AdGuard Home will enforce safe search in the following search engines: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
|
||||
"enforce_save_search_hint": "AdGuard Home will enforce safe search in the following search engines: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
|
||||
"no_servers_specified": "No servers specified",
|
||||
"general_settings": "General settings",
|
||||
"dns_settings": "DNS settings",
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ type SafeSearchConfig struct {
|
|||
|
||||
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"`
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ var pixabay string
|
|||
//go:embed rules/duckduckgo.txt
|
||||
var duckduckgo string
|
||||
|
||||
//go:embed rules/ecosia.txt
|
||||
var ecosia string
|
||||
|
||||
//go:embed rules/yandex.txt
|
||||
var yandex string
|
||||
|
||||
|
|
@ -27,6 +30,7 @@ var youtube string
|
|||
var safeSearchRules = map[Service]string{
|
||||
Bing: bing,
|
||||
DuckDuckGo: duckduckgo,
|
||||
Ecosia: ecosia,
|
||||
Google: google,
|
||||
Pixabay: pixabay,
|
||||
Yandex: yandex,
|
||||
|
|
|
|||
1
internal/filtering/safesearch/rules/ecosia.txt
Normal file
1
internal/filtering/safesearch/rules/ecosia.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
|www.ecosia.org^$dnsrewrite=NOERROR;CNAME;strict-safe-search.ecosia.org
|
||||
|
|
@ -28,6 +28,7 @@ type Service string
|
|||
const (
|
||||
Bing Service = "bing"
|
||||
DuckDuckGo Service = "duckduckgo"
|
||||
Ecosia Service = "ecosia"
|
||||
Google Service = "google"
|
||||
Pixabay Service = "pixabay"
|
||||
Yandex Service = "yandex"
|
||||
|
|
@ -41,6 +42,8 @@ func isServiceProtected(s filtering.SafeSearchConfig, service Service) (ok bool)
|
|||
return s.Bing
|
||||
case DuckDuckGo:
|
||||
return s.DuckDuckGo
|
||||
case Ecosia:
|
||||
return s.Ecosia
|
||||
case Google:
|
||||
return s.Google
|
||||
case Pixabay:
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ var defaultSafeSearchConf = filtering.SafeSearchConfig{
|
|||
Enabled: true,
|
||||
Bing: true,
|
||||
DuckDuckGo: true,
|
||||
Ecosia: true,
|
||||
Google: true,
|
||||
Pixabay: true,
|
||||
Yandex: true,
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ var testConf = filtering.SafeSearchConfig{
|
|||
|
||||
Bing: true,
|
||||
DuckDuckGo: true,
|
||||
Ecosia: true,
|
||||
Google: true,
|
||||
Pixabay: true,
|
||||
Yandex: true,
|
||||
|
|
|
|||
|
|
@ -248,6 +248,7 @@ func copySafeSearch(
|
|||
if conf.Enabled {
|
||||
conf.Bing = true
|
||||
conf.DuckDuckGo = true
|
||||
conf.Ecosia = true
|
||||
conf.Google = true
|
||||
conf.Pixabay = true
|
||||
conf.Yandex = true
|
||||
|
|
|
|||
|
|
@ -423,6 +423,7 @@ var config = &configuration{
|
|||
Enabled: false,
|
||||
Bing: true,
|
||||
DuckDuckGo: true,
|
||||
Ecosia: true,
|
||||
Google: true,
|
||||
Pixabay: true,
|
||||
Yandex: true,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,14 @@
|
|||
|
||||
## v0.108.0: API changes
|
||||
|
||||
## v0.107.55: API changes
|
||||
|
||||
### The new field `"ecosia"` in `SafeSearchConfig`
|
||||
|
||||
* The new field `"ecosia"` in `PUT /control/safesearch/settings` and
|
||||
`GET /control/safesearch/status` is true if safe search is enforced for Ecosia
|
||||
search engine.
|
||||
|
||||
## v0.107.44: API changes
|
||||
|
||||
### The field `"upstream_mode"` in `DNSConfig`
|
||||
|
|
|
|||
|
|
@ -2578,6 +2578,8 @@
|
|||
'type': 'boolean'
|
||||
'duckduckgo':
|
||||
'type': 'boolean'
|
||||
'ecosia':
|
||||
'type': 'boolean'
|
||||
'google':
|
||||
'type': 'boolean'
|
||||
'pixabay':
|
||||
|
|
|
|||
Loading…
Reference in a new issue