From fc063f580fe6cdfbbafff3f6c834cc4fc8efdcc4 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Tue, 27 Jul 2021 19:22:25 +0300 Subject: [PATCH] Pull request: 3372 dnscrypt querylog Merge in DNS/adguard-home from 3372-dnscrypt-logs to master Updates #3372. Squashed commit of the following: commit 603383227540e1e62911c66d3c0440187d6a313c Merge: c0379e2b f2046a5f Author: Eugene Burkov Date: Tue Jul 27 19:05:18 2021 +0300 Merge branch 'master' into 3372-dnscrypt-logs commit c0379e2bb53376efaf0a222e5be9a232821059c6 Author: Eugene Burkov Date: Tue Jul 27 18:58:07 2021 +0300 all: fix log of changes commit 7ba9dba530684f00f17e8cafbd6a7f5ccde8579c Author: Eugene Burkov Date: Tue Jul 27 18:54:05 2021 +0300 all: log changes commit dbf107642bb39df63b45bd2844e10e3d682e3455 Author: Eugene Burkov Date: Tue Jul 27 18:09:51 2021 +0300 all: upd dnscrypt --- CHANGELOG.md | 2 ++ go.mod | 2 +- go.sum | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b51e30fc..cb71b998 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ and this project adheres to ### Fixed +- DNSCrypt queries weren't appearing in query log ([#3372]). - Wrong IP address for proxied DNS-over-HTTPS queries ([#2799]). - Domain name letter case mismatches in DNS rewrites ([#3351]). - Conflicts between IPv4 and IPv6 DNS rewrites ([#3343]). @@ -110,6 +111,7 @@ and this project adheres to [#3335]: https://github.com/AdguardTeam/AdGuardHome/issues/3335 [#3343]: https://github.com/AdguardTeam/AdGuardHome/issues/3343 [#3351]: https://github.com/AdguardTeam/AdGuardHome/issues/3351 +[#3372]: https://github.com/AdguardTeam/AdGuardHome/issues/3372 diff --git a/go.mod b/go.mod index c46b58cb..5c7094b8 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/AdguardTeam/golibs v0.8.0 github.com/AdguardTeam/urlfilter v0.14.6 github.com/NYTimes/gziphandler v1.1.1 - github.com/ameshkov/dnscrypt/v2 v2.1.3 + github.com/ameshkov/dnscrypt/v2 v2.2.1 github.com/digineo/go-ipset/v2 v2.2.1 github.com/fsnotify/fsnotify v1.4.9 github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020 diff --git a/go.sum b/go.sum index c5a4574d..3551a8db 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,8 @@ github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyY github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us= github.com/ameshkov/dnscrypt/v2 v2.1.3 h1:DG4Uf7LSDg6XDj9sp3maxh3Ur26jeGQaP5MeYosn6v0= github.com/ameshkov/dnscrypt/v2 v2.1.3/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= +github.com/ameshkov/dnscrypt/v2 v2.2.1 h1:+cApRxzeBZqjUNsN26TTz7r5A8U+buON3kJgIYE3QWQ= +github.com/ameshkov/dnscrypt/v2 v2.2.1/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo= github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=