From 3f1b71fdf3ef62f5f262dfefa544c9c0d0c7e852 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Mon, 26 Apr 2021 17:18:42 +0300 Subject: [PATCH] Pull request: 2981 fix double answers Merge in DNS/adguard-home from 2981-fix-dnsrewrite to master Closes #2981. Updates #2923. Squashed commit of the following: commit 578754d194a9a9dd0d47e5af7b6c2f315eaa1d1d Author: Eugene Burkov Date: Fri Apr 23 17:07:24 2021 +0300 all: upd urlfilter --- CHANGELOG.md | 5 +++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 507cf6d2..b9578c7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to ### Added +- `$denyallow` modifier for filters ([#2923]). - Hostname uniqueness validation in the DHCP server ([#2952]). - Hostname generating for DHCP clients which don't provide their own ([#2723]). - New flag `--no-etc-hosts` to disable client domain name lookups in the @@ -52,6 +53,8 @@ and this project adheres to ### Fixed +- Multiple answers for `$dnsrewrite` rule matching requests with repeating + patterns in it ([#2981]). - Root server resolving when custom upstreams for hosts are specified ([#2994]). - Inconsistent resolving of DHCP clients when the DHCP server is disabled ([#2934]). @@ -83,6 +86,7 @@ and this project adheres to [#2838]: https://github.com/AdguardTeam/AdGuardHome/issues/2838 [#2843]: https://github.com/AdguardTeam/AdGuardHome/issues/2843 [#2889]: https://github.com/AdguardTeam/AdGuardHome/issues/2889 +[#2923]: https://github.com/AdguardTeam/AdGuardHome/issues/2923 [#2927]: https://github.com/AdguardTeam/AdGuardHome/issues/2927 [#2934]: https://github.com/AdguardTeam/AdGuardHome/issues/2934 [#2945]: https://github.com/AdguardTeam/AdGuardHome/issues/2945 @@ -90,6 +94,7 @@ and this project adheres to [#2952]: https://github.com/AdguardTeam/AdGuardHome/issues/2952 [#2954]: https://github.com/AdguardTeam/AdGuardHome/issues/2954 [#2961]: https://github.com/AdguardTeam/AdGuardHome/issues/2961 +[#2981]: https://github.com/AdguardTeam/AdGuardHome/issues/2981 [#2994]: https://github.com/AdguardTeam/AdGuardHome/issues/2994 [doq-draft-02]: https://tools.ietf.org/html/draft-ietf-dprive-dnsoquic-02 diff --git a/go.mod b/go.mod index aed1b624..32a40cfb 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/AdguardTeam/dnsproxy v0.37.2 github.com/AdguardTeam/golibs v0.4.5 - github.com/AdguardTeam/urlfilter v0.14.4 + github.com/AdguardTeam/urlfilter v0.14.5 github.com/NYTimes/gziphandler v1.1.1 github.com/ameshkov/dnscrypt/v2 v2.1.3 github.com/digineo/go-ipset/v2 v2.2.1 diff --git a/go.sum b/go.sum index 405e78c5..d4c5ea0b 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKU github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U= github.com/AdguardTeam/golibs v0.4.5/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU= -github.com/AdguardTeam/urlfilter v0.14.4 h1:lrS7lrfxVCFh4TFB6nwPp5UE4n1XNvv3zUetduD9mZw= -github.com/AdguardTeam/urlfilter v0.14.4/go.mod h1:klx4JbOfc4EaNb5lWLqOwfg+pVcyRukmoJRvO55lL5U= +github.com/AdguardTeam/urlfilter v0.14.5 h1:WyF0hg0MwKevsqNPkoaZFH8f5WRi/yuy/7qePtYt5Ts= +github.com/AdguardTeam/urlfilter v0.14.5/go.mod h1:klx4JbOfc4EaNb5lWLqOwfg+pVcyRukmoJRvO55lL5U= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=