From f165fd91c03c621fe9e7c0d59d3d7403399da7c9 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Mon, 21 Dec 2020 15:43:27 +0300 Subject: [PATCH 1/3] Pull request: fix dns cache ttl check Merge in DNS/adguard-home from 2459-dns-ttl to master Updates #2459. Squashed commit of the following: commit 27e74e30b202ab5163ebdbc2c00622099b11a1ff Author: Eugene Burkov Date: Mon Dec 21 15:00:46 2020 +0300 all: log changes commit e476fa5c4b8fd3896fa401f4dc546a5d937746eb Author: Eugene Burkov Date: Mon Dec 21 14:55:30 2020 +0300 dnsforward: fix dns cache ttl check --- CHANGELOG.md | 2 ++ internal/dnsforward/http.go | 3 ++- internal/dnsforward/msg.go | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e3a35c7a03..3fdf434a358 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ and this project adheres to ### Fixed +- Inability to set DNS cache TTL limits ([#2459]). - Possible freezes on slower machines ([#2225]). - A mitigation against records being shown in the wrong order on the query log page ([#2293]). @@ -68,6 +69,7 @@ and this project adheres to [#2293]: https://github.com/AdguardTeam/AdGuardHome/issues/2293 [#2345]: https://github.com/AdguardTeam/AdGuardHome/issues/2345 [#2355]: https://github.com/AdguardTeam/AdGuardHome/issues/2355 +[#2459]: https://github.com/AdguardTeam/AdGuardHome/issues/2459 ### Removed diff --git a/internal/dnsforward/http.go b/internal/dnsforward/http.go index c6c33c4e307..e24ba89eb20 100644 --- a/internal/dnsforward/http.go +++ b/internal/dnsforward/http.go @@ -167,11 +167,12 @@ func (req *dnsConfig) checkCacheTTL() bool { if req.CacheMinTTL == nil && req.CacheMaxTTL == nil { return true } + var min, max uint32 if req.CacheMinTTL != nil { min = *req.CacheMinTTL } - if req.CacheMaxTTL == nil { + if req.CacheMaxTTL != nil { max = *req.CacheMaxTTL } diff --git a/internal/dnsforward/msg.go b/internal/dnsforward/msg.go index 3c381704807..2e72c40c970 100644 --- a/internal/dnsforward/msg.go +++ b/internal/dnsforward/msg.go @@ -42,7 +42,6 @@ func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Resu if result.Reason == dnsfilter.FilteredSafeSearch && len(result.Rules) > 0 && result.Rules[0].IP != nil { - return s.genResponseWithIP(m, result.Rules[0].IP) } From 2f265f249e5bc4d20a7a35ab10274c84baa9eba3 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 21 Dec 2020 13:51:08 +0100 Subject: [PATCH 2/3] Remove an unused function --- scripts/querylog/anonymize.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/querylog/anonymize.js b/scripts/querylog/anonymize.js index 3aed2877d26..ea2a3d39421 100644 --- a/scripts/querylog/anonymize.js +++ b/scripts/querylog/anonymize.js @@ -2,11 +2,6 @@ const fs = require('fs'); const readline = require('readline'); const dnsPacket = require('dns-packet') -const decodeBase64 = (data) => { - let buff = new Buffer(data, 'base64'); - return buff.toString('ascii'); -} - const processLineByLine = async (source, callback) => { const fileStream = fs.createReadStream(source); From 61691fdedbe1002699f773892fff687ed7b31204 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 21 Dec 2020 13:53:19 +0100 Subject: [PATCH 3/3] Remove a superfluous condition `value` is always evaluated to true, due to the check on the previous line --- client/src/helpers/validators.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/helpers/validators.js b/client/src/helpers/validators.js index 9b853120f2d..f2fee026093 100644 --- a/client/src/helpers/validators.js +++ b/client/src/helpers/validators.js @@ -64,7 +64,7 @@ export const validateClientId = (value) => { if (!value) { return undefined; } - const formattedValue = value ? value.trim() : value; + const formattedValue = value.trim(); if (formattedValue && !( R_IPV4.test(formattedValue) || R_IPV6.test(formattedValue)