all: sync with master; upd chlog

internal/filtering/safesearch/safesearch.go

@@ -8,6 +8,7 @@ import (
 	"encoding/gob"
 	"fmt"
 	"net"
+	"net/netip"
 	"strings"
 	"sync"
 	"time"
@@ -239,10 +240,9 @@ func (ss *Default) newResult(
 	}
 
 	if rewrite.RRType == qtype {
-		v := rewrite.Value
-		ip, ok := v.(net.IP)
-		if !ok || ip == nil {
-			return nil, fmt.Errorf("expected ip rewrite value, got %T(%[1]v)", v)
+		ip, ok := rewrite.Value.(netip.Addr)
+		if !ok || ip == (netip.Addr{}) {
+			return nil, fmt.Errorf("expected ip rewrite value, got %T(%[1]v)", rewrite.Value)
 		}
 
 		res.Rules[0].IP = ip
@@ -267,12 +267,13 @@ func (ss *Default) newResult(
 	for _, ip := range ips {
 		// TODO(a.garipov): Remove this filtering once the resolver we use
 		// actually learns about network.
-		ip = fitToProto(ip, qtype)
-		if ip == nil {
+		addr := fitToProto(ip, qtype)
+		if addr == (netip.Addr{}) {
 			continue
 		}
 
-		res.Rules[0].IP = ip
+		// TODO(e.burkov):  Rules[0]?
+		res.Rules[0].IP = addr
 	}
 
 	return res, nil
@@ -293,17 +294,16 @@ func qtypeToProto(qtype rules.RRType) (proto string) {
 
 // fitToProto returns a non-nil IP address if ip is the correct protocol version
 // for qtype.  qtype is expected to be either [dns.TypeA] or [dns.TypeAAAA].
-func fitToProto(ip net.IP, qtype rules.RRType) (res net.IP) {
-	ip4 := ip.To4()
-	if qtype == dns.TypeA {
-		return ip4
+func fitToProto(ip net.IP, qtype rules.RRType) (res netip.Addr) {
+	if ip4 := ip.To4(); qtype == dns.TypeA {
+		if ip4 != nil {
+			return netip.AddrFrom4([4]byte(ip4))
+		}
+	} else if ip = ip.To16(); ip != nil && qtype == dns.TypeAAAA {
+		return netip.AddrFrom16([16]byte(ip))
 	}
 
-	if ip4 == nil {
-		return ip
-	}
-
-	return nil
+	return netip.Addr{}
 }
 
 // setCacheResult stores data in cache for host.  qtype is expected to be either

internal/filtering/safesearch/safesearch_internal_test.go

@@ -3,6 +3,7 @@ package safesearch
 import (
 	"context"
 	"net"
+	"net/netip"
 	"testing"
 	"time"
 
@@ -33,7 +34,7 @@ var defaultSafeSearchConf = filtering.SafeSearchConfig{
 	YouTube:    true,
 }
 
-var yandexIP = net.IPv4(213, 180, 193, 56)
+var yandexIP = netip.AddrFrom4([4]byte{213, 180, 193, 56})
 
 func newForTest(t testing.TB, ssConf filtering.SafeSearchConfig) (ss *Default) {
 	ss, err := NewDefault(ssConf, "", testCacheSize, testCacheTTL)
@@ -93,7 +94,7 @@ func TestSafeSearchCacheGoogle(t *testing.T) {
 		OnLookupIP: func(_ context.Context, _, host string) (ips []net.IP, err error) {
 			ip4, ip6 := aghtest.HostToIPs(host)
 
-			return []net.IP{ip4, ip6}, nil
+			return []net.IP{ip4.AsSlice(), ip6.AsSlice()}, nil
 		},
 	}
 
@@ -109,14 +110,14 @@ func TestSafeSearchCacheGoogle(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, res.Rules, 1)
 
-	assert.True(t, res.Rules[0].IP.Equal(wantIP))
+	assert.Equal(t, wantIP, res.Rules[0].IP)
 
 	// Check cache.
 	cachedValue, isFound := ss.getCachedResult(domain, testQType)
 	require.True(t, isFound)
 	require.Len(t, cachedValue.Rules, 1)
 
-	assert.True(t, cachedValue.Rules[0].IP.Equal(wantIP))
+	assert.Equal(t, wantIP, cachedValue.Rules[0].IP)
 }
 
 const googleHost = "www.google.com"

internal/filtering/safesearch/safesearch_test.go

@@ -3,6 +3,7 @@ package safesearch_test
 import (
 	"context"
 	"net"
+	"net/netip"
 	"testing"
 	"time"
 
@@ -43,7 +44,7 @@ var testConf = filtering.SafeSearchConfig{
 
 // yandexIP is the expected IP address of Yandex safe search results.  Keep in
 // sync with the rules data.
-var yandexIP = net.IPv4(213, 180, 193, 56)
+var yandexIP = netip.AddrFrom4([4]byte{213, 180, 193, 56})
 
 func TestDefault_CheckHost_yandex(t *testing.T) {
 	conf := testConf
@@ -87,7 +88,7 @@ func TestDefault_CheckHost_yandexAAAA(t *testing.T) {
 	// once the TODO in [safesearch.Default.newResult] is resolved.
 	require.Len(t, res.Rules, 1)
 
-	assert.Nil(t, res.Rules[0].IP)
+	assert.Empty(t, res.Rules[0].IP)
 	assert.EqualValues(t, filtering.SafeSearchListID, res.Rules[0].FilterListID)
 }
 
@@ -96,7 +97,7 @@ func TestDefault_CheckHost_google(t *testing.T) {
 		OnLookupIP: func(_ context.Context, _, host string) (ips []net.IP, err error) {
 			ip4, ip6 := aghtest.HostToIPs(host)
 
-			return []net.IP{ip4, ip6}, nil
+			return []net.IP{ip4.AsSlice(), ip6.AsSlice()}, nil
 		},
 	}
 
@@ -178,7 +179,7 @@ func TestDefault_CheckHost_duckduckgoAAAA(t *testing.T) {
 	// once the TODO in [safesearch.Default.newResult] is resolved.
 	require.Len(t, res.Rules, 1)
 
-	assert.Nil(t, res.Rules[0].IP)
+	assert.Empty(t, res.Rules[0].IP)
 	assert.EqualValues(t, filtering.SafeSearchListID, res.Rules[0].FilterListID)
 }