all: sync with master

internal/client/storage.go

@@ -675,6 +675,7 @@ func (s *Storage) ClearUpstreamCache() {
 
 // ApplyClientFiltering retrieves persistent client information using the
 // ClientID or client IP address, and applies it to the filtering settings.
+// setts must not be nil.
 func (s *Storage) ApplyClientFiltering(id string, addr netip.Addr, setts *filtering.Settings) {
 	c, ok := s.index.findByClientID(id)
 	if !ok {
@@ -689,8 +690,6 @@ func (s *Storage) ApplyClientFiltering(id string, addr netip.Addr, setts *filter
 
 	s.logger.Debug("applying custom client filtering settings", "client_name", c.Name)
 
-	setts.ClientIP = addr
-
 	if c.UseOwnBlockedServices {
 		setts.BlockedServices = c.BlockedServices.Clone()
 	}

internal/filtering/filter.go

@@ -634,8 +634,9 @@ func (d *DNSFilter) enableFiltersLocked(async bool) {
 // ApplyAdditionalFiltering enhances the provided filtering settings with
 // blocked services and client-specific configurations.
 func (d *DNSFilter) ApplyAdditionalFiltering(cliAddr netip.Addr, clientID string, setts *Settings) {
-	d.ApplyBlockedServices(setts)
+	setts.ClientIP = cliAddr
 
+	d.ApplyBlockedServices(setts)
 	d.applyClientFiltering(clientID, cliAddr, setts)
 	if setts.BlockedServices != nil {
 		// TODO(e.burkov):  Get rid of this crutch.

internal/filtering/filtering.go

@@ -932,10 +932,9 @@ func (d *DNSFilter) matchHost(
 	ufReq := &urlfilter.DNSRequest{
 		Hostname:         host,
 		SortedClientTags: setts.ClientTags,
-		// TODO(e.burkov): Wait for urlfilter update to pass net.IP.
-		ClientIP:   setts.ClientIP,
-		ClientName: setts.ClientName,
-		DNSType:    rrtype,
+		ClientIP:         setts.ClientIP,
+		ClientName:       setts.ClientName,
+		DNSType:          rrtype,
 	}
 
 	d.engineLock.RLock()

internal/filtering/http.go

@@ -459,7 +459,6 @@ func (d *DNSFilter) handleCheckHost(w http.ResponseWriter, r *http.Request) {
 
 	addr, err := netip.ParseAddr(cli)
 	if err == nil {
-		setts.ClientIP = addr
 		d.ApplyAdditionalFiltering(addr, "", setts)
 	} else if cli != "" {
 		// TODO(s.chzhen):  Set [Settings.ClientName] once urlfilter supports