Merge branch 'master' into 2102-dnsrewrite

heyxkhoa · Dec 21, 2020 · 8490fc1 · 8490fc1
2 parents d9448dd + e7f7799
commit 8490fc1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -58,6 +58,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]).
@@ -69,6 +70,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/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)

diff --git 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
@@ -47,7 +47,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)
 		}
 

diff --git 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);