Merge branch 'master' into 3290-kill-zombies

CHANGELOG.md

@@ -31,7 +31,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
   is described in `openapi/openapi.yaml`.  The duration of this pause could
   also be set with the config field `protection_disabled_until` in `dns`
   section of the YAML configuration file.
-- Ability to create a static DHCP lease from a dynamic one more easily
+- The ability to create a static DHCP lease from a dynamic one more easily
   ([#3459]).
 - Two new HTTP APIs, `PUT /control/stats/config/update` and `GET
   control/stats/config`, which can be used to set and receive the query log
@@ -103,10 +103,10 @@ In this release, the schema version has changed from 17 to 20.
 - The `POST /control/safesearch/disable` HTTP API is deprecated.  Use the new
   `PUT /control/safesearch/settings` API
 - The `safesearch_enabled` field is deprecated in the following HTTP APIs:
-  - `GET /control/clients`
-  - `POST /control/clients/add`
-  - `POST /control/clients/update`
-  - `GET /control/clients/find?ip0=...&ip1=...&ip2=...`
+  - `GET /control/clients`;
+  - `POST /control/clients/add`;
+  - `POST /control/clients/update`;
+  - `GET /control/clients/find?ip0=...&ip1=...&ip2=...`.
 
   Check `openapi/openapi.yaml` for more details.
 - The `GET /control/stats_info` HTTP API; use the new `GET

go.mod

@@ -63,7 +63,3 @@ require (
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect
 )
-
-// TODO(a.garipov): Remove this and update github.com/ameshkov/dnscrypt when
-// it's released.
-replace github.com/ameshkov/dnscrypt/v2 => github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230315131826-cdb2bf61bda8

go.sum

@@ -15,8 +15,8 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmH
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
-github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230315131826-cdb2bf61bda8 h1:jc3/aOQ01Yy3vxB/uqcuUi4F+6E/FKWaTCHq5J1ef2o=
-github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230315131826-cdb2bf61bda8/go.mod h1:qPWhwz6FdSmuK7W4sMyvogrez4MWdtzosdqlr0Rg3ow=
+github.com/ameshkov/dnscrypt/v2 v2.2.6 h1:rE7AFbPWebq7me7RVS66Cipd1m7ef1yf2+C8QzjQXXE=
+github.com/ameshkov/dnscrypt/v2 v2.2.6/go.mod h1:qPWhwz6FdSmuK7W4sMyvogrez4MWdtzosdqlr0Rg3ow=
 github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
 github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
 github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG++IsjHiI2p4bxALD1Y2nQKGMR5zDQM=

internal/querylog/http.go

@@ -60,41 +60,48 @@ type getConfigResp struct {
 // Register web handlers
 func (l *queryLog) initWeb() {
 	l.conf.HTTPRegister(http.MethodGet, "/control/querylog", l.handleQueryLog)
-	l.conf.HTTPRegister(http.MethodGet, "/control/querylog_info", l.handleQueryLogInfo)
 	l.conf.HTTPRegister(http.MethodPost, "/control/querylog_clear", l.handleQueryLogClear)
-	l.conf.HTTPRegister(http.MethodPost, "/control/querylog_config", l.handleQueryLogConfig)
-
 	l.conf.HTTPRegister(http.MethodGet, "/control/querylog/config", l.handleGetQueryLogConfig)
 	l.conf.HTTPRegister(
 		http.MethodPut,
 		"/control/querylog/config/update",
 		l.handlePutQueryLogConfig,
 	)
+
+	// Deprecated handlers.
+	l.conf.HTTPRegister(http.MethodGet, "/control/querylog_info", l.handleQueryLogInfo)
+	l.conf.HTTPRegister(http.MethodPost, "/control/querylog_config", l.handleQueryLogConfig)
 }
 
+// handleQueryLog is the handler for the GET /control/querylog HTTP API.
 func (l *queryLog) handleQueryLog(w http.ResponseWriter, r *http.Request) {
-	l.lock.Lock()
-	defer l.lock.Unlock()
-
-	params, err := l.parseSearchParams(r)
+	params, err := parseSearchParams(r)
 	if err != nil {
-		aghhttp.Error(r, w, http.StatusBadRequest, "failed to parse params: %s", err)
+		aghhttp.Error(r, w, http.StatusBadRequest, "parsing params: %s", err)
 
 		return
 	}
 
-	entries, oldest := l.search(params)
-	data := l.entriesToJSON(entries, oldest)
+	var resp map[string]any
+	func() {
+		l.lock.Lock()
+		defer l.lock.Unlock()
 
-	_ = aghhttp.WriteJSONResponse(w, r, data)
+		entries, oldest := l.search(params)
+		resp = l.entriesToJSON(entries, oldest)
+	}()
+
+	_ = aghhttp.WriteJSONResponse(w, r, resp)
 }
 
+// handleQueryLogClear is the handler for the POST /control/querylog/clear HTTP
+// API.
 func (l *queryLog) handleQueryLogClear(_ http.ResponseWriter, _ *http.Request) {
 	l.clear()
 }
 
-// handleQueryLogInfo handles requests to the GET /control/querylog_info
-// endpoint.
+// handleQueryLogInfo is the handler for the GET /control/querylog_info HTTP
+// API.
 //
 // Deprecated:  Remove it when migration to the new API is over.
 func (l *queryLog) handleQueryLogInfo(w http.ResponseWriter, r *http.Request) {
@@ -116,20 +123,25 @@ func (l *queryLog) handleQueryLogInfo(w http.ResponseWriter, r *http.Request) {
 	})
 }
 
-// handleGetQueryLogConfig handles requests to the GET /control/querylog/config
-// endpoint.
+// handleGetQueryLogConfig is the handler for the GET /control/querylog/config
+// HTTP API.
 func (l *queryLog) handleGetQueryLogConfig(w http.ResponseWriter, r *http.Request) {
-	l.lock.Lock()
-	defer l.lock.Unlock()
+	var resp *getConfigResp
+	func() {
+		l.lock.Lock()
+		defer l.lock.Unlock()
+
+		resp = &getConfigResp{
+			Interval:          float64(l.conf.RotationIvl.Milliseconds()),
+			Enabled:           aghalg.BoolToNullBool(l.conf.Enabled),
+			AnonymizeClientIP: aghalg.BoolToNullBool(l.conf.AnonymizeClientIP),
+			Ignored:           l.conf.Ignored.Values(),
+		}
 
-	ignored := l.conf.Ignored.Values()
-	slices.Sort(ignored)
-	_ = aghhttp.WriteJSONResponse(w, r, getConfigResp{
-		Ignored:           ignored,
-		Interval:          float64(l.conf.RotationIvl.Milliseconds()),
-		Enabled:           aghalg.BoolToNullBool(l.conf.Enabled),
-		AnonymizeClientIP: aghalg.BoolToNullBool(l.conf.AnonymizeClientIP),
-	})
+		slices.Sort(resp.Ignored)
+	}()
+
+	_ = aghhttp.WriteJSONResponse(w, r, resp)
 }
 
 // AnonymizeIP masks ip to anonymize the client if the ip is a valid one.
@@ -146,7 +158,8 @@ func AnonymizeIP(ip net.IP) {
 	}
 }
 
-// handleQueryLogConfig handles the POST /control/querylog_config queries.
+// handleQueryLogConfig is the handler for the POST /control/querylog_config
+// HTTP API.
 //
 // Deprecated:  Remove it when migration to the new API is over.
 func (l *queryLog) handleQueryLogConfig(w http.ResponseWriter, r *http.Request) {
@@ -198,8 +211,8 @@ func (l *queryLog) handleQueryLogConfig(w http.ResponseWriter, r *http.Request)
 	l.conf = &conf
 }
 
-// handlePutQueryLogConfig handles the PUT /control/querylog/config/update
-// queries.
+// handlePutQueryLogConfig is the handler for the PUT
+// /control/querylog/config/update HTTP API.
 func (l *queryLog) handlePutQueryLogConfig(w http.ResponseWriter, r *http.Request) {
 	newConf := &getConfigResp{}
 	err := json.NewDecoder(r.Body).Decode(newConf)
@@ -268,7 +281,7 @@ func getDoubleQuotesEnclosedValue(s *string) bool {
 }
 
 // parseSearchCriterion parses a search criterion from the query parameter.
-func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
+func parseSearchCriterion(q url.Values, name string, ct criterionType) (
 	ok bool,
 	sc searchCriterion,
 	err error,
@@ -317,8 +330,9 @@ func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionT
 	return true, sc, nil
 }
 
-// parseSearchParams - parses "searchParams" from the HTTP request's query string
-func (l *queryLog) parseSearchParams(r *http.Request) (p *searchParams, err error) {
+// parseSearchParams parses search parameters from the HTTP request's query
+// string.
+func parseSearchParams(r *http.Request) (p *searchParams, err error) {
 	p = newSearchParams()
 
 	q := r.URL.Query()
@@ -356,7 +370,7 @@ func (l *queryLog) parseSearchParams(r *http.Request) (p *searchParams, err erro
 	}} {
 		var ok bool
 		var c searchCriterion
-		ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct)
+		ok, c, err = parseSearchCriterion(q, v.urlField, v.ct)
 		if err != nil {
 			return nil, err
 		}

internal/querylog/qlog.go

@@ -155,10 +155,13 @@ func (l *queryLog) clear() {
 	l.fileFlushLock.Lock()
 	defer l.fileFlushLock.Unlock()
 
-	l.bufferLock.Lock()
-	l.buffer = nil
-	l.flushPending = false
-	l.bufferLock.Unlock()
+	func() {
+		l.bufferLock.Lock()
+		defer l.bufferLock.Unlock()
+
+		l.buffer = nil
+		l.flushPending = false
+	}()
 
 	oldLogFile := l.logFile + ".1"
 	err := os.Remove(oldLogFile)
@@ -241,26 +244,30 @@ func (l *queryLog) Add(params *AddParams) {
 		entry.OrigAnswer = a
 	}
 
-	l.bufferLock.Lock()
-	l.buffer = append(l.buffer, &entry)
 	needFlush := false
-
-	if !l.conf.FileEnabled {
-		if len(l.buffer) > int(l.conf.MemSize) {
-			// writing to file is disabled - just remove the oldest entry from array
-			//
-			// TODO(a.garipov): This should be replaced by a proper ring buffer,
-			// but it's currently difficult to do that.
-			l.buffer[0] = nil
-			l.buffer = l.buffer[1:]
+	func() {
+		l.bufferLock.Lock()
+		defer l.bufferLock.Unlock()
+
+		l.buffer = append(l.buffer, &entry)
+
+		if !l.conf.FileEnabled {
+			if len(l.buffer) > int(l.conf.MemSize) {
+				// Writing to file is disabled, so just remove the oldest entry
+				// from the slices.
+				//
+				// TODO(a.garipov): This should be replaced by a proper ring
+				// buffer, but it's currently difficult to do that.
+				l.buffer[0] = nil
+				l.buffer = l.buffer[1:]
+			}
+		} else if !l.flushPending {
+			needFlush = len(l.buffer) >= int(l.conf.MemSize)
+			if needFlush {
+				l.flushPending = true
+			}
 		}
-	} else if !l.flushPending {
-		needFlush = len(l.buffer) >= int(l.conf.MemSize)
-		if needFlush {
-			l.flushPending = true
-		}
-	}
-	l.bufferLock.Unlock()
+	}()
 
 	// if buffer needs to be flushed to disk, do it now
 	if needFlush {

internal/querylog/qlogreader.go

@@ -106,6 +106,7 @@ func (r *QLogReader) SeekStart() error {
 
 	r.currentFile = len(r.qFiles) - 1
 	_, err := r.qFiles[r.currentFile].SeekStart()
+
 	return err
 }
 

internal/querylog/querylogfile.go

@@ -11,40 +11,52 @@ import (
 	"github.com/AdguardTeam/golibs/log"
 )
 
-// flushLogBuffer flushes the current buffer to file and resets the current buffer
-func (l *queryLog) flushLogBuffer(fullFlush bool) error {
+// flushLogBuffer flushes the current buffer to file and resets the current
+// buffer.
+func (l *queryLog) flushLogBuffer(fullFlush bool) (err error) {
 	if !l.conf.FileEnabled {
 		return nil
 	}
 
 	l.fileFlushLock.Lock()
 	defer l.fileFlushLock.Unlock()
 
-	// flush remainder to file
-	l.bufferLock.Lock()
-	needFlush := len(l.buffer) >= int(l.conf.MemSize)
-	if !needFlush && !fullFlush {
-		l.bufferLock.Unlock()
+	// Flush the remainder to file.
+	var flushBuffer []*logEntry
+	needFlush := fullFlush
+	func() {
+		l.bufferLock.Lock()
+		defer l.bufferLock.Unlock()
+
+		needFlush = needFlush || len(l.buffer) >= int(l.conf.MemSize)
+		if needFlush {
+			flushBuffer = l.buffer
+			l.buffer = nil
+			l.flushPending = false
+		}
+	}()
+	if !needFlush {
 		return nil
 	}
-	flushBuffer := l.buffer
-	l.buffer = nil
-	l.flushPending = false
-	l.bufferLock.Unlock()
-	err := l.flushToFile(flushBuffer)
+
+	err = l.flushToFile(flushBuffer)
 	if err != nil {
-		log.Error("Saving querylog to file failed: %s", err)
+		log.Error("querylog: writing to file: %s", err)
+
 		return err
 	}
+
 	return nil
 }
 
 // flushToFile saves the specified log entries to the query log file
 func (l *queryLog) flushToFile(buffer []*logEntry) (err error) {
 	if len(buffer) == 0 {
-		log.Debug("querylog: there's nothing to write to a file")
+		log.Debug("querylog: nothing to write to a file")
+
 		return nil
 	}
+
 	start := time.Now()
 
 	var b bytes.Buffer