From 7631ca4ab3a74304378702ca3cfb641ee6a62fd4 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 13 Apr 2023 20:17:59 +0300 Subject: [PATCH] Pull request 1828: AG-21377-default-safe-search Merge in DNS/adguard-home from AG-21377-default-safe-search to master Squashed commit of the following: commit 35c66b97c787d02fe6f2ffb6902dcd9b6f9b9569 Author: Ainar Garipov Date: Thu Apr 13 20:05:13 2023 +0300 home: fix default safe search svcs --- CHANGELOG.md | 1 + internal/home/config.go | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36ce3fb6..a3b495f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ NOTE: Add new changes BELOW THIS COMMENT. ### Fixed +- All Safe Search services being unchecked by default. - Panic when a DNSCrypt stamp is invalid ([#5721]). [#5721]: https://github.com/AdguardTeam/AdGuardHome/issues/5721 diff --git a/internal/home/config.go b/internal/home/config.go index 8eb7694f..c97e671c 100644 --- a/internal/home/config.go +++ b/internal/home/config.go @@ -296,12 +296,26 @@ var config = &configuration{ MaxGoroutines: 300, }, DnsfilterConf: &filtering.Config{ - SafeBrowsingCacheSize: 1 * 1024 * 1024, - SafeSearchCacheSize: 1 * 1024 * 1024, - ParentalCacheSize: 1 * 1024 * 1024, - CacheTime: 30, FilteringEnabled: true, FiltersUpdateIntervalHours: 24, + + ParentalEnabled: false, + SafeBrowsingEnabled: false, + + SafeBrowsingCacheSize: 1 * 1024 * 1024, + SafeSearchCacheSize: 1 * 1024 * 1024, + ParentalCacheSize: 1 * 1024 * 1024, + CacheTime: 30, + + SafeSearchConf: filtering.SafeSearchConfig{ + Enabled: false, + Bing: true, + DuckDuckGo: true, + Google: true, + Pixabay: true, + Yandex: true, + YouTube: true, + }, }, UpstreamTimeout: timeutil.Duration{Duration: dnsforward.DefaultTimeout}, UsePrivateRDNS: true,