AdGuardHome/internal/filtering/safesearch.go

60 lines
1.8 KiB
Go
Raw Normal View History

package filtering
2018-08-30 17:25:33 +03:00
import "github.com/miekg/dns"
Pull request 1163 safesearch package vol.1 Merge in DNS/adguard-home from 1163-safesearch-1-1 to master Squashed commit of the following: commit ccc8393304441b0edbcd15598d29764fb5d5fc34 Merge: 7d3901b5 6b265c64 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 7 21:36:24 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1 commit 7d3901b5753f6456192f3533c257de7ae3bef6ac Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sat Mar 4 10:15:18 2023 +0700 all: safesearch imp code commit 94a50dc61d955f659cda123825389225d0ebfc3e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 3 13:22:41 2023 +0700 safesearch: imp code commit aa6e30fed8f67ffbc336f619f299fbd789c86ada Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:43:28 2023 +0700 safesearch: imp code commit 30e75b6fa85edfdf66b7ace68cad4cbc61b28ea6 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:38:14 2023 +0700 safesearch: imp code commit 7d95ec73392b20519eab0e869ccba0c30404ae6f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:24:49 2023 +0700 safesearch: imp code commit d6c0a0fbf9ad836606fbbfe31702e84773a2709d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:04:53 2023 +0700 safesearch: imp code commit fa179b767bf75ed931cd62f282220d1f7025c641 Merge: 7a43ca00 012e5beb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 20:52:01 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1 commit 7a43ca001ccab4d53b059c0e7843f2fc5b7dcefc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:59:35 2023 +0700 safesearch: embed rules commit 2b1a83d6ffacc89a3e81a8327653018ed803f15b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:50:29 2023 +0700 safesearch: imp code commit 400d463d32490cde7b4f55f3bb5a68e022e1c762 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:30:57 2023 +0700 safesearch: imp code commit 60cce36bdef0cf0def28c760a3d767314a03f176 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:16:56 2023 +0700 all: imp code commit 4eee3237b736fd16870835458757da550bcef295 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Feb 28 23:26:17 2023 +0700 all: safesearch package
2023-03-07 17:52:03 +03:00
// 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].
Pull request 1163 safesearch package vol.1 Merge in DNS/adguard-home from 1163-safesearch-1-1 to master Squashed commit of the following: commit ccc8393304441b0edbcd15598d29764fb5d5fc34 Merge: 7d3901b5 6b265c64 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 7 21:36:24 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1 commit 7d3901b5753f6456192f3533c257de7ae3bef6ac Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sat Mar 4 10:15:18 2023 +0700 all: safesearch imp code commit 94a50dc61d955f659cda123825389225d0ebfc3e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 3 13:22:41 2023 +0700 safesearch: imp code commit aa6e30fed8f67ffbc336f619f299fbd789c86ada Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:43:28 2023 +0700 safesearch: imp code commit 30e75b6fa85edfdf66b7ace68cad4cbc61b28ea6 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:38:14 2023 +0700 safesearch: imp code commit 7d95ec73392b20519eab0e869ccba0c30404ae6f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:24:49 2023 +0700 safesearch: imp code commit d6c0a0fbf9ad836606fbbfe31702e84773a2709d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:04:53 2023 +0700 safesearch: imp code commit fa179b767bf75ed931cd62f282220d1f7025c641 Merge: 7a43ca00 012e5beb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 20:52:01 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1 commit 7a43ca001ccab4d53b059c0e7843f2fc5b7dcefc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:59:35 2023 +0700 safesearch: embed rules commit 2b1a83d6ffacc89a3e81a8327653018ed803f15b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:50:29 2023 +0700 safesearch: imp code commit 400d463d32490cde7b4f55f3bb5a68e022e1c762 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:30:57 2023 +0700 safesearch: imp code commit 60cce36bdef0cf0def28c760a3d767314a03f176 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:16:56 2023 +0700 all: imp code commit 4eee3237b736fd16870835458757da550bcef295 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Feb 28 23:26:17 2023 +0700 all: safesearch package
2023-03-07 17:52:03 +03:00
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)
Pull request 1163 safesearch package vol.1 Merge in DNS/adguard-home from 1163-safesearch-1-1 to master Squashed commit of the following: commit ccc8393304441b0edbcd15598d29764fb5d5fc34 Merge: 7d3901b5 6b265c64 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 7 21:36:24 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1 commit 7d3901b5753f6456192f3533c257de7ae3bef6ac Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sat Mar 4 10:15:18 2023 +0700 all: safesearch imp code commit 94a50dc61d955f659cda123825389225d0ebfc3e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 3 13:22:41 2023 +0700 safesearch: imp code commit aa6e30fed8f67ffbc336f619f299fbd789c86ada Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:43:28 2023 +0700 safesearch: imp code commit 30e75b6fa85edfdf66b7ace68cad4cbc61b28ea6 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:38:14 2023 +0700 safesearch: imp code commit 7d95ec73392b20519eab0e869ccba0c30404ae6f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:24:49 2023 +0700 safesearch: imp code commit d6c0a0fbf9ad836606fbbfe31702e84773a2709d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:04:53 2023 +0700 safesearch: imp code commit fa179b767bf75ed931cd62f282220d1f7025c641 Merge: 7a43ca00 012e5beb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 20:52:01 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1 commit 7a43ca001ccab4d53b059c0e7843f2fc5b7dcefc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:59:35 2023 +0700 safesearch: embed rules commit 2b1a83d6ffacc89a3e81a8327653018ed803f15b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:50:29 2023 +0700 safesearch: imp code commit 400d463d32490cde7b4f55f3bb5a68e022e1c762 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:30:57 2023 +0700 safesearch: imp code commit 60cce36bdef0cf0def28c760a3d767314a03f176 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:16:56 2023 +0700 all: imp code commit 4eee3237b736fd16870835458757da550bcef295 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Feb 28 23:26:17 2023 +0700 all: safesearch package
2023-03-07 17:52:03 +03:00
}
// SafeSearchConfig is a struct with safe search related settings.
type SafeSearchConfig struct {
// CustomResolver is the resolver used by safe search.
Pull request: 1163 safesearch http api vol.3 Merge in DNS/adguard-home from 1163-safesearch-1-3 to master Squashed commit of the following: commit f26c5fb4f7a27dc61b10c28d6672d5307796784c Merge: e7a1b885 143616ca Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 23 18:45:25 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3 # Conflicts: # CHANGELOG.md commit e7a1b885d67628c187ce08327338cf3138012f03 Merge: 01b73d76 eb5d8a49 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Wed Mar 22 13:55:23 2023 +0200 Merge branch '1163-safesearch-1-3' of ssh://bit.adguard.com:7999/dns/adguard-home into 1163-safesearch-1-3 commit 01b73d763c6ee76de995093cc7107f113c7785ce Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Wed Mar 22 13:52:02 2023 +0200 client: add safe search extended settings to clients commit eb5d8a499ac1036e5077d2b4aa84479381577e10 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 22 18:50:23 2023 +0700 all: docs commit 2043a8fba7f664ef365ccc5abac14a85035eb4b7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 22 09:42:50 2023 +0700 all: docs commit bb1d2f6c0252891ccac3d3727eb23288a24d4bda Merge: 95f9fd3d c3edab43 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 22 09:42:00 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3 commit 95f9fd3dd1e8abcdf1a156e81aff8e52f320f4c3 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 15:25:39 2023 +0200 client: move to new safe search api commit ac823a911f0d6ab6f1813d11a0ca082d54cc9131 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 20 22:40:29 2023 +0700 all: docs commit aaa287b125c7c7a775b821e0dd272199229a7538 Merge: 16fa7031 48431f8b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 20 22:39:14 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3 commit 16fa7031ab2aec31139ace54ffa0155cde8e9135 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 20 22:39:03 2023 +0700 all: docs commit 498f7d3cbb842eda218b0fd06fc3bb3601b81f80 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 20 18:59:47 2023 +0700 filtering: imp code commit aab7b70e2355ba86577e5156c1d5569b21b4b358 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 20 18:40:18 2023 +0700 filtering: imp code commit d2870a18ffdb1d293993487073912168d6b75a38 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 17 21:57:58 2023 +0700 filtering: imp code commit 868f5d1ed29c3af702114079e7ffe46e136eb901 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 17 19:06:36 2023 +0700 all: imp docs commit f6d70b06ed873684501ce17f647ccf07a85dd50b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 17 19:05:40 2023 +0700 filtering: imp code commit 7cd9a37dde6262a8cf4f0f13f9946e011cc0e2cf Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 16 14:56:51 2023 +0700 home: imp code commit 84d8817512e47a517ed2880ffa9dde5ffda1d288 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 16 09:39:41 2023 +0700 all: safesearch http api
2023-03-23 15:25:58 +03:00
CustomResolver Resolver `yaml:"-" json:"-"`
Pull request 1163 safesearch package vol.1 Merge in DNS/adguard-home from 1163-safesearch-1-1 to master Squashed commit of the following: commit ccc8393304441b0edbcd15598d29764fb5d5fc34 Merge: 7d3901b5 6b265c64 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 7 21:36:24 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1 commit 7d3901b5753f6456192f3533c257de7ae3bef6ac Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sat Mar 4 10:15:18 2023 +0700 all: safesearch imp code commit 94a50dc61d955f659cda123825389225d0ebfc3e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 3 13:22:41 2023 +0700 safesearch: imp code commit aa6e30fed8f67ffbc336f619f299fbd789c86ada Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:43:28 2023 +0700 safesearch: imp code commit 30e75b6fa85edfdf66b7ace68cad4cbc61b28ea6 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:38:14 2023 +0700 safesearch: imp code commit 7d95ec73392b20519eab0e869ccba0c30404ae6f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:24:49 2023 +0700 safesearch: imp code commit d6c0a0fbf9ad836606fbbfe31702e84773a2709d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 21:04:53 2023 +0700 safesearch: imp code commit fa179b767bf75ed931cd62f282220d1f7025c641 Merge: 7a43ca00 012e5beb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 20:52:01 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1 commit 7a43ca001ccab4d53b059c0e7843f2fc5b7dcefc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:59:35 2023 +0700 safesearch: embed rules commit 2b1a83d6ffacc89a3e81a8327653018ed803f15b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:50:29 2023 +0700 safesearch: imp code commit 400d463d32490cde7b4f55f3bb5a68e022e1c762 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:30:57 2023 +0700 safesearch: imp code commit 60cce36bdef0cf0def28c760a3d767314a03f176 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 11:16:56 2023 +0700 all: imp code commit 4eee3237b736fd16870835458757da550bcef295 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Feb 28 23:26:17 2023 +0700 all: safesearch package
2023-03-07 17:52:03 +03:00
// 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"`
}
Pull request: 1163 safesearch vol.2 Merge in DNS/adguard-home from 1163-safesearch-1-2-1 to master Squashed commit of the following: commit d3a5ebef35210019842145074e898129b42f1f2c Merge: b85264ae c6706445 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 15 09:17:53 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 # Conflicts: # CHANGELOG.md commit b85264aefc5f191ac6cb194b519f03ba15829a4e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 14 00:16:07 2023 +0700 home: imp code commit ac2ed7a5ce8db40628e7d4d1c8634641e5f38b0b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 23:02:06 2023 +0700 all: changelog commit f0fccafcb01f50c7051df53bbe9b02cab75aa71e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 22:42:36 2023 +0700 all: changelog commit 37df29bf6372939644fb28e3d70365496e0cb4f6 Merge: b227b277 595484e0 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 22:38:57 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 commit b227b2775b4866d69241ad87acf99700715552cb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 16:56:01 2023 +0700 all: imp docs commit 6fd39fc3565c3f4bc7a7113d17733c20dfe24d8d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 16:55:03 2023 +0700 home: imp code commit 3bb3bb7c7dcf97b2a5602a7d2b6770c08b4d863d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 12:16:53 2023 +0700 home: imp docs commit 5f573a56a9fd9942ad677fa0fae6b24228dab653 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 11:56:47 2023 +0700 home: imp code commit 23eeb5552cf2510596b2311cc3eda53ac678ffcc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 10 10:57:33 2023 +0700 home: imp code commit 643de2fca1b5917c61fe83e1e472222404f3cd21 Merge: dada6e63 a2053526 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 21:03:08 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 commit dada6e63ca5324d30775e2da1727da891743f654 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 17:09:03 2023 +0700 all: imp docs commit 81a180d99dd9a995440d5f4e2ebca34678e7d0c7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 15:12:43 2023 +0700 all: imp code commit fa84877bc777004d246d71d0a9ae0bd9ee568a91 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 10:53:05 2023 +0700 all: imp code commit 6d7e02e745d72921a693d4f09eec7ce21c2aefd4 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 10:40:02 2023 +0700 all: imp docs commit 0a4332997070fb8d2fb3a34d32b92f57a325ff06 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 7 22:00:52 2023 +0700 safesearch: fix merge commit 145c2222ba4cf7f8909b816d83829d2217c94243 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 2 11:41:48 2023 +0700 safesearch: fix merge commit 14c6a8005fe15b5d5a39f91b17c96d8670975811 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 12:50:09 2023 +0700 all: docs commit 2a85c8831866bf1c34c423a289461fc1e32667b5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 12:47:00 2023 +0700 all: use safesearch package
2023-03-15 14:31:07 +03:00
// 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 !setts.ProtectionEnabled ||
!setts.SafeSearchEnabled ||
(qtype != dns.TypeA && qtype != dns.TypeAAAA) {
return Result{}, nil
}
Pull request: 1163 safesearch vol.2 Merge in DNS/adguard-home from 1163-safesearch-1-2-1 to master Squashed commit of the following: commit d3a5ebef35210019842145074e898129b42f1f2c Merge: b85264ae c6706445 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 15 09:17:53 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 # Conflicts: # CHANGELOG.md commit b85264aefc5f191ac6cb194b519f03ba15829a4e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 14 00:16:07 2023 +0700 home: imp code commit ac2ed7a5ce8db40628e7d4d1c8634641e5f38b0b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 23:02:06 2023 +0700 all: changelog commit f0fccafcb01f50c7051df53bbe9b02cab75aa71e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 22:42:36 2023 +0700 all: changelog commit 37df29bf6372939644fb28e3d70365496e0cb4f6 Merge: b227b277 595484e0 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 22:38:57 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 commit b227b2775b4866d69241ad87acf99700715552cb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 16:56:01 2023 +0700 all: imp docs commit 6fd39fc3565c3f4bc7a7113d17733c20dfe24d8d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 16:55:03 2023 +0700 home: imp code commit 3bb3bb7c7dcf97b2a5602a7d2b6770c08b4d863d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 12:16:53 2023 +0700 home: imp docs commit 5f573a56a9fd9942ad677fa0fae6b24228dab653 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 11:56:47 2023 +0700 home: imp code commit 23eeb5552cf2510596b2311cc3eda53ac678ffcc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 10 10:57:33 2023 +0700 home: imp code commit 643de2fca1b5917c61fe83e1e472222404f3cd21 Merge: dada6e63 a2053526 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 21:03:08 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 commit dada6e63ca5324d30775e2da1727da891743f654 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 17:09:03 2023 +0700 all: imp docs commit 81a180d99dd9a995440d5f4e2ebca34678e7d0c7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 15:12:43 2023 +0700 all: imp code commit fa84877bc777004d246d71d0a9ae0bd9ee568a91 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 10:53:05 2023 +0700 all: imp code commit 6d7e02e745d72921a693d4f09eec7ce21c2aefd4 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 10:40:02 2023 +0700 all: imp docs commit 0a4332997070fb8d2fb3a34d32b92f57a325ff06 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 7 22:00:52 2023 +0700 safesearch: fix merge commit 145c2222ba4cf7f8909b816d83829d2217c94243 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 2 11:41:48 2023 +0700 safesearch: fix merge commit 14c6a8005fe15b5d5a39f91b17c96d8670975811 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 12:50:09 2023 +0700 all: docs commit 2a85c8831866bf1c34c423a289461fc1e32667b5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 12:47:00 2023 +0700 all: use safesearch package
2023-03-15 14:31:07 +03:00
if d.safeSearch == nil {
return Result{}, nil
}
Pull request: 1163 safesearch vol.2 Merge in DNS/adguard-home from 1163-safesearch-1-2-1 to master Squashed commit of the following: commit d3a5ebef35210019842145074e898129b42f1f2c Merge: b85264ae c6706445 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 15 09:17:53 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 # Conflicts: # CHANGELOG.md commit b85264aefc5f191ac6cb194b519f03ba15829a4e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 14 00:16:07 2023 +0700 home: imp code commit ac2ed7a5ce8db40628e7d4d1c8634641e5f38b0b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 23:02:06 2023 +0700 all: changelog commit f0fccafcb01f50c7051df53bbe9b02cab75aa71e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 22:42:36 2023 +0700 all: changelog commit 37df29bf6372939644fb28e3d70365496e0cb4f6 Merge: b227b277 595484e0 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 22:38:57 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 commit b227b2775b4866d69241ad87acf99700715552cb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 16:56:01 2023 +0700 all: imp docs commit 6fd39fc3565c3f4bc7a7113d17733c20dfe24d8d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 16:55:03 2023 +0700 home: imp code commit 3bb3bb7c7dcf97b2a5602a7d2b6770c08b4d863d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 12:16:53 2023 +0700 home: imp docs commit 5f573a56a9fd9942ad677fa0fae6b24228dab653 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Mar 13 11:56:47 2023 +0700 home: imp code commit 23eeb5552cf2510596b2311cc3eda53ac678ffcc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Mar 10 10:57:33 2023 +0700 home: imp code commit 643de2fca1b5917c61fe83e1e472222404f3cd21 Merge: dada6e63 a2053526 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 21:03:08 2023 +0700 Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1 commit dada6e63ca5324d30775e2da1727da891743f654 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 17:09:03 2023 +0700 all: imp docs commit 81a180d99dd9a995440d5f4e2ebca34678e7d0c7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 15:12:43 2023 +0700 all: imp code commit fa84877bc777004d246d71d0a9ae0bd9ee568a91 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 10:53:05 2023 +0700 all: imp code commit 6d7e02e745d72921a693d4f09eec7ce21c2aefd4 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 9 10:40:02 2023 +0700 all: imp docs commit 0a4332997070fb8d2fb3a34d32b92f57a325ff06 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Mar 7 22:00:52 2023 +0700 safesearch: fix merge commit 145c2222ba4cf7f8909b816d83829d2217c94243 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 2 11:41:48 2023 +0700 safesearch: fix merge commit 14c6a8005fe15b5d5a39f91b17c96d8670975811 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 12:50:09 2023 +0700 all: docs commit 2a85c8831866bf1c34c423a289461fc1e32667b5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 1 12:47:00 2023 +0700 all: use safesearch package
2023-03-15 14:31:07 +03:00
clientSafeSearch := setts.ClientSafeSearch
if clientSafeSearch != nil {
return clientSafeSearch.CheckHost(host, qtype)
}
return d.safeSearch.CheckHost(host, qtype)
2018-08-30 17:25:33 +03:00
}