From 44168292d5f466b9e7cda271987f03363ab6d6a8 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 11 Feb 2021 13:46:59 +0300 Subject: [PATCH] Pull request: 2662 dnscrypt logs Merge in DNS/adguard-home from 2662-dnscrypt-logs to master Closes #2662. Squashed commit of the following: commit 05f6742b5c73e1d150834965ae3a54ca06ef8e24 Author: Ainar Garipov Date: Thu Feb 11 12:58:08 2021 +0300 all: imp docs commit ee0b8c574c1cb5302a5ffb62d2fec4126509b2e8 Merge: aaa8c6b8 e64df20e Author: Ainar Garipov Date: Thu Feb 11 12:56:44 2021 +0300 Merge branch 'master' into 2662-dnscrypt-logs commit aaa8c6b8085679f4acd234527bd03cb0b2520b4f Author: Ainar Garipov Date: Thu Feb 11 12:38:49 2021 +0300 all: document changes commit 57b6a4d8e95e87d928274d095dc2004f1591d940 Author: Ainar Garipov Date: Thu Feb 11 12:36:22 2021 +0300 all: fix dnscrypt in logs --- CHANGELOG.md | 4 ++++ client/src/__locales/en.json | 3 ++- client/src/helpers/constants.js | 1 + internal/querylog/qlog.go | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f16494d9..1b17ff8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,9 +20,13 @@ and this project adheres to ### Fixed - Incorrect version tag in the Docker release ([#2663]). +- DNSCrypt queries weren't marked as such in logs ([#2662]). +[#2662]: https://github.com/AdguardTeam/AdGuardHome/issues/2662 [#2663]: https://github.com/AdguardTeam/AdGuardHome/issues/2663 + + ## [v0.105.0] - 2021-02-10 ### Added diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json index 697a7307..b558dd60 100644 --- a/client/src/__locales/en.json +++ b/client/src/__locales/en.json @@ -248,6 +248,7 @@ "custom_ip": "Custom IP", "blocking_ipv4": "Blocking IPv4", "blocking_ipv6": "Blocking IPv6", + "dnscrypt": "DNSCrypt", "dns_over_https": "DNS-over-HTTPS", "dns_over_tls": "DNS-over-TLS", "dns_over_quic": "DNS-over-QUIC", @@ -593,4 +594,4 @@ "adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.", "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.", "experimental": "Experimental" -} \ No newline at end of file +} diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js index bab8c925..0c9919ac 100644 --- a/client/src/helpers/constants.js +++ b/client/src/helpers/constants.js @@ -534,6 +534,7 @@ export const BLOCK_ACTIONS = { }; export const SCHEME_TO_PROTOCOL_MAP = { + dnscrypt: 'dnscrypt', doh: 'dns_over_https', dot: 'dns_over_tls', doq: 'dns_over_quic', diff --git a/internal/querylog/qlog.go b/internal/querylog/qlog.go index 41ce9823..4726f075 100644 --- a/internal/querylog/qlog.go +++ b/internal/querylog/qlog.go @@ -53,6 +53,7 @@ func NewClientProto(s string) (cp ClientProto, err error) { ClientProtoDOH, ClientProtoDOQ, ClientProtoDOT, + ClientProtoDNSCrypt, ClientProtoPlain: return cp, nil