mirror of
				https://github.com/coredns/coredns.git
				synced 2025-11-04 03:03:14 -05:00 
			
		
		
		
	Eagerly set name in newElem and make Name() read-only to avoid racy lazy writes under concurrent lookups. Add tests for empty-name comparisons and concurrent access to Less/Name(). In addition, regression tests to CloudDNS plugin. Signed-off-by: Ville Vesilehto <ville@vesilehto.fi>
		
			
				
	
	
		
			122 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			122 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
package tree
 | 
						|
 | 
						|
import (
 | 
						|
	"sort"
 | 
						|
	"strings"
 | 
						|
	"sync"
 | 
						|
	"testing"
 | 
						|
 | 
						|
	"github.com/miekg/dns"
 | 
						|
)
 | 
						|
 | 
						|
type set []string
 | 
						|
 | 
						|
func (p set) Len() int           { return len(p) }
 | 
						|
func (p set) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
 | 
						|
func (p set) Less(i, j int) bool { d := less(p[i], p[j]); return d <= 0 }
 | 
						|
 | 
						|
func TestLess(t *testing.T) {
 | 
						|
	tests := []struct {
 | 
						|
		in  []string
 | 
						|
		out []string
 | 
						|
	}{
 | 
						|
		{
 | 
						|
			[]string{"aaa.powerdns.de", "bbb.powerdns.net.", "xxx.powerdns.com."},
 | 
						|
			[]string{"xxx.powerdns.com.", "aaa.powerdns.de", "bbb.powerdns.net."},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			[]string{"aaa.POWERDNS.de", "bbb.PoweRdnS.net.", "xxx.powerdns.com."},
 | 
						|
			[]string{"xxx.powerdns.com.", "aaa.POWERDNS.de", "bbb.PoweRdnS.net."},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			[]string{"aaa.aaaa.aa.", "aa.aaa.a.", "bbb.bbbb.bb."},
 | 
						|
			[]string{"aa.aaa.a.", "aaa.aaaa.aa.", "bbb.bbbb.bb."},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			[]string{"aaaaa.", "aaa.", "bbb."},
 | 
						|
			[]string{"aaa.", "aaaaa.", "bbb."},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			[]string{"a.a.a.a.", "a.a.", "a.a.a."},
 | 
						|
			[]string{"a.a.", "a.a.a.", "a.a.a.a."},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			[]string{"example.", "z.example.", "a.example."},
 | 
						|
			[]string{"example.", "a.example.", "z.example."},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			[]string{"a.example.", "Z.a.example.", "z.example.", "yljkjljk.a.example.", "\\001.z.example.", "example.", "*.z.example.", "\\200.z.example.", "zABC.a.EXAMPLE."},
 | 
						|
			[]string{"example.", "a.example.", "yljkjljk.a.example.", "Z.a.example.", "zABC.a.EXAMPLE.", "z.example.", "\\001.z.example.", "*.z.example.", "\\200.z.example."},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			// RFC3034 example.
 | 
						|
			[]string{"a.example.", "Z.a.example.", "z.example.", "yljkjljk.a.example.", "example.", "*.z.example.", "zABC.a.EXAMPLE."},
 | 
						|
			[]string{"example.", "a.example.", "yljkjljk.a.example.", "Z.a.example.", "zABC.a.EXAMPLE.", "z.example.", "*.z.example."},
 | 
						|
		},
 | 
						|
	}
 | 
						|
 | 
						|
Tests:
 | 
						|
	for j, test := range tests {
 | 
						|
		// Need to lowercase these example as the Less function does lowercase for us anymore.
 | 
						|
		for i, b := range test.in {
 | 
						|
			test.in[i] = strings.ToLower(b)
 | 
						|
		}
 | 
						|
		for i, b := range test.out {
 | 
						|
			test.out[i] = strings.ToLower(b)
 | 
						|
		}
 | 
						|
 | 
						|
		sort.Sort(set(test.in))
 | 
						|
		for i := range len(test.in) {
 | 
						|
			if test.in[i] != test.out[i] {
 | 
						|
				t.Errorf("Test %d: expected %s, got %s", j, test.out[i], test.in[i])
 | 
						|
				n := ""
 | 
						|
				for k, in := range test.in {
 | 
						|
					if k+1 == len(test.in) {
 | 
						|
						n = "\n"
 | 
						|
					}
 | 
						|
					t.Logf("%s <-> %s\n%s", in, test.out[k], n)
 | 
						|
				}
 | 
						|
				continue Tests
 | 
						|
			}
 | 
						|
		}
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func TestLess_EmptyVsName(t *testing.T) {
 | 
						|
	if d := less("", "a."); d >= 0 {
 | 
						|
		t.Fatalf("expected < 0, got %d", d)
 | 
						|
	}
 | 
						|
	if d := less("a.", ""); d <= 0 {
 | 
						|
		t.Fatalf("expected > 0, got %d", d)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func TestLess_EmptyVsEmpty(t *testing.T) {
 | 
						|
	if d := less("", ""); d != 0 {
 | 
						|
		t.Fatalf("expected 0, got %d", d)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
// Test that concurrent calls to Less (which calls Elem.Name) do not race or panic.
 | 
						|
// See issue #7561 for reference.
 | 
						|
func TestLess_ConcurrentNameAccess(t *testing.T) {
 | 
						|
	rr, err := dns.NewRR("a.example. 3600 IN A 1.2.3.4")
 | 
						|
	if err != nil {
 | 
						|
		t.Fatalf("failed to create RR: %v", err)
 | 
						|
	}
 | 
						|
	e := newElem(rr)
 | 
						|
 | 
						|
	const n = 200
 | 
						|
	var wg sync.WaitGroup
 | 
						|
	wg.Add(n)
 | 
						|
	for range n {
 | 
						|
		go func() {
 | 
						|
			defer wg.Done()
 | 
						|
			// Compare the same name repeatedly; previously this could race due to lazy Name() writes.
 | 
						|
			_ = Less(e, "a.example.")
 | 
						|
			_ = e.Name()
 | 
						|
		}()
 | 
						|
	}
 | 
						|
	wg.Wait()
 | 
						|
}
 |