Merge branch 'master' into 2666-req-body-lim

AdguardTeam · Feb 11, 2021 · a525974 · a525974
2 parents 947703f + 4416829
commit a525974
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,10 +26,14 @@ and this project adheres to
 
 - Set the request body size limit for HTTPS reqeusts as well.
 - 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
 [#2666]: https://github.com/AdguardTeam/AdGuardHome/issues/2666
 
+
+
 ## [v0.105.0] - 2021-02-10
 
 ### Added

diff --git 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"
-}
+}
diff --git 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
@@ -53,6 +53,7 @@ func NewClientProto(s string) (cp ClientProto, err error) {
 		ClientProtoDOH,
 		ClientProtoDOQ,
 		ClientProtoDOT,
+		ClientProtoDNSCrypt,
 		ClientProtoPlain:
 
 		return cp, nil