From 72a160ac59395cd700d270eaf7234c95c62533ea Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Tue, 14 Dec 2021 18:20:25 +0300 Subject: [PATCH] Pull request: all: do not apply $denyallow to ip addrs Closes #3175. Squashed commit of the following: commit e80e4610a1ce70787d758c718cc7171570bcdd72 Author: Ainar Garipov Date: Tue Dec 14 18:03:26 2021 +0300 all: imp docs commit 3c73a727e91f7da3d4bbbbf9c019997af4bebd33 Author: Ainar Garipov Date: Tue Dec 14 17:57:01 2021 +0300 all: do not apply $denyallow to ip addrs --- CHANGELOG.md | 3 +++ go.mod | 5 +++-- go.sum | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60733eab..5b81fe94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -128,6 +128,8 @@ In this release, the schema version has changed from 10 to 12. ### Fixed +- Rules with the `$denyallow` modifier applying to IP addresses when they + shouldn't ([#3175]). - The length of the EDNS client subnet option appearing too long for some upstream servers ([#3887]). - Invalid redirection to the HTTPS web interface after saving enabled encryption @@ -197,6 +199,7 @@ In this release, the schema version has changed from 10 to 12. [#3162]: https://github.com/AdguardTeam/AdGuardHome/issues/3162 [#3166]: https://github.com/AdguardTeam/AdGuardHome/issues/3166 [#3172]: https://github.com/AdguardTeam/AdGuardHome/issues/3172 +[#3175]: https://github.com/AdguardTeam/AdGuardHome/issues/3175 [#3184]: https://github.com/AdguardTeam/AdGuardHome/issues/3184 [#3185]: https://github.com/AdguardTeam/AdGuardHome/issues/3185 [#3186]: https://github.com/AdguardTeam/AdGuardHome/issues/3186 diff --git a/go.mod b/go.mod index 2bdb70d5..4e54143a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/AdguardTeam/dnsproxy v0.39.13 github.com/AdguardTeam/golibs v0.10.3 - github.com/AdguardTeam/urlfilter v0.15.0 + github.com/AdguardTeam/urlfilter v0.15.1 github.com/NYTimes/gziphandler v1.1.1 github.com/ameshkov/dnscrypt/v2 v2.2.2 github.com/digineo/go-ipset/v2 v2.2.1 @@ -22,7 +22,6 @@ require ( github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf github.com/miekg/dns v1.1.43 github.com/satori/go.uuid v1.2.0 - github.com/stretchr/objx v0.1.1 // indirect github.com/stretchr/testify v1.7.0 github.com/ti-mo/netfilter v0.4.0 go.etcd.io/bbolt v1.3.6 @@ -34,5 +33,7 @@ require ( howett.net/plist v0.0.0-20201203080718-1454fab16a06 ) +require github.com/stretchr/objx v0.1.1 // indirect + // TODO(e.burkov): Get rid of the fork in v0.108.0. replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf diff --git a/go.sum b/go.sum index 1160e146..8e838a0c 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,8 @@ github.com/AdguardTeam/golibs v0.9.2/go.mod h1:fCAMwPBJ8S7YMYbTWvYS+eeTLblP5E04I github.com/AdguardTeam/golibs v0.10.3 h1:FBgk17zf35ESVWQKIqEUiqqB2bDaCBC8X5vMU760yB4= github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw= github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU= -github.com/AdguardTeam/urlfilter v0.15.0 h1:K3WWZE0K5nPTHe2l+TRXDFpYWJJnvkHdlWidt6NQUTk= -github.com/AdguardTeam/urlfilter v0.15.0/go.mod h1:EwXwrYhowP7bedqmOrmKKmQtpBYFyDNEBFQ+lxdUgQU= +github.com/AdguardTeam/urlfilter v0.15.1 h1:dP6S7J6eFAk8MN4IDpUq2fZoBo8K8fmc6pXpxNIv84M= +github.com/AdguardTeam/urlfilter v0.15.1/go.mod h1:EwXwrYhowP7bedqmOrmKKmQtpBYFyDNEBFQ+lxdUgQU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=