all: sync with master; upd chlog

internal/stats/http.go

@@ -7,8 +7,12 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/timeutil"
+	"golang.org/x/exp/slices"
 )
 
 // topAddrs is an alias for the types of the TopFoo fields of statsResponse.
@@ -38,13 +42,21 @@ type StatsResp struct {
 	AvgProcessingTime float64 `json:"avg_processing_time"`
 }
 
-// handleStats handles requests to the GET /control/stats endpoint.
+// handleStats is the handler for the GET /control/stats HTTP API.
 func (s *StatsCtx) handleStats(w http.ResponseWriter, r *http.Request) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
 	start := time.Now()
-	resp, ok := s.getData(s.limitHours)
+
+	var (
+		resp StatsResp
+		ok   bool
+	)
+	func() {
+		s.confMu.RLock()
+		defer s.confMu.RUnlock()
+
+		resp, ok = s.getData(uint32(s.limit.Hours()))
+	}()
+
 	log.Debug("stats: prepared data in %v", time.Since(start))
 
 	if !ok {
@@ -63,20 +75,73 @@ type configResp struct {
 	IntervalDays uint32 `json:"interval"`
 }
 
-// handleStatsInfo handles requests to the GET /control/stats_info endpoint.
-func (s *StatsCtx) handleStatsInfo(w http.ResponseWriter, r *http.Request) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
+// getConfigResp is the response to the GET /control/stats_info.
+type getConfigResp struct {
+	// Ignored is the list of host names, which should not be counted.
+	Ignored []string `json:"ignored"`
 
-	resp := configResp{IntervalDays: s.limitHours / 24}
-	if !s.enabled {
+	// Interval is the statistics rotation interval in milliseconds.
+	Interval float64 `json:"interval"`
+
+	// Enabled shows if statistics are enabled.  It is an aghalg.NullBool to be
+	// able to tell when it's set without using pointers.
+	Enabled aghalg.NullBool `json:"enabled"`
+}
+
+// handleStatsInfo is the handler for the GET /control/stats_info HTTP API.
+//
+// Deprecated:  Remove it when migration to the new API is over.
+func (s *StatsCtx) handleStatsInfo(w http.ResponseWriter, r *http.Request) {
+	var (
+		enabled bool
+		limit   time.Duration
+	)
+	func() {
+		s.confMu.RLock()
+		defer s.confMu.RUnlock()
+
+		enabled, limit = s.enabled, s.limit
+	}()
+
+	days := uint32(limit / timeutil.Day)
+	ok := checkInterval(days)
+	if !ok || (enabled && days == 0) {
+		// NOTE: If interval is custom we set it to 90 days for compatibility
+		// with old API.
+		days = 90
+	}
+
+	resp := configResp{IntervalDays: days}
+	if !enabled {
 		resp.IntervalDays = 0
 	}
+
 	_ = aghhttp.WriteJSONResponse(w, r, resp)
 }
 
-// handleStatsConfig handles requests to the POST /control/stats_config
-// endpoint.
+// handleGetStatsConfig is the handler for the GET /control/stats/config HTTP
+// API.
+func (s *StatsCtx) handleGetStatsConfig(w http.ResponseWriter, r *http.Request) {
+	var resp *getConfigResp
+	func() {
+		s.confMu.RLock()
+		defer s.confMu.RUnlock()
+
+		resp = &getConfigResp{
+			Ignored:  s.ignored.Values(),
+			Interval: float64(s.limit.Milliseconds()),
+			Enabled:  aghalg.BoolToNullBool(s.enabled),
+		}
+	}()
+
+	slices.Sort(resp.Ignored)
+
+	_ = aghhttp.WriteJSONResponse(w, r, resp)
+}
+
+// handleStatsConfig is the handler for the POST /control/stats_config HTTP API.
+//
+// Deprecated:  Remove it when migration to the new API is over.
 func (s *StatsCtx) handleStatsConfig(w http.ResponseWriter, r *http.Request) {
 	reqData := configResp{}
 	err := json.NewDecoder(r.Body).Decode(&reqData)
@@ -92,11 +157,59 @@ func (s *StatsCtx) handleStatsConfig(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	s.setLimit(int(reqData.IntervalDays))
-	s.configModified()
+	limit := time.Duration(reqData.IntervalDays) * timeutil.Day
+
+	defer s.configModified()
+
+	s.confMu.Lock()
+	defer s.confMu.Unlock()
+
+	s.setLimit(limit)
 }
 
-// handleStatsReset handles requests to the POST /control/stats_reset endpoint.
+// handlePutStatsConfig is the handler for the PUT /control/stats/config/update
+// HTTP API.
+func (s *StatsCtx) handlePutStatsConfig(w http.ResponseWriter, r *http.Request) {
+	reqData := getConfigResp{}
+	err := json.NewDecoder(r.Body).Decode(&reqData)
+	if err != nil {
+		aghhttp.Error(r, w, http.StatusBadRequest, "json decode: %s", err)
+
+		return
+	}
+
+	set, err := aghnet.NewDomainNameSet(reqData.Ignored)
+	if err != nil {
+		aghhttp.Error(r, w, http.StatusUnprocessableEntity, "ignored: %s", err)
+
+		return
+	}
+
+	ivl := time.Duration(reqData.Interval) * time.Millisecond
+	err = validateIvl(ivl)
+	if err != nil {
+		aghhttp.Error(r, w, http.StatusUnprocessableEntity, "unsupported interval: %s", err)
+
+		return
+	}
+
+	if reqData.Enabled == aghalg.NBNull {
+		aghhttp.Error(r, w, http.StatusUnprocessableEntity, "enabled is null")
+
+		return
+	}
+
+	defer s.configModified()
+
+	s.confMu.Lock()
+	defer s.confMu.Unlock()
+
+	s.ignored = set
+	s.limit = ivl
+	s.enabled = reqData.Enabled == aghalg.NBTrue
+}
+
+// handleStatsReset is the handler for the POST /control/stats_reset HTTP API.
 func (s *StatsCtx) handleStatsReset(w http.ResponseWriter, r *http.Request) {
 	err := s.clear()
 	if err != nil {
@@ -112,6 +225,10 @@ func (s *StatsCtx) initWeb() {
 
 	s.httpRegister(http.MethodGet, "/control/stats", s.handleStats)
 	s.httpRegister(http.MethodPost, "/control/stats_reset", s.handleStatsReset)
-	s.httpRegister(http.MethodPost, "/control/stats_config", s.handleStatsConfig)
+	s.httpRegister(http.MethodGet, "/control/stats/config", s.handleGetStatsConfig)
+	s.httpRegister(http.MethodPut, "/control/stats/config/update", s.handlePutStatsConfig)
+
+	// Deprecated handlers.
 	s.httpRegister(http.MethodGet, "/control/stats_info", s.handleStatsInfo)
+	s.httpRegister(http.MethodPost, "/control/stats_config", s.handleStatsConfig)
 }