letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1600 from letsencrypt/privatize-dns 

Make a couple of fields private on DNS impl
This commit is contained in:
Kane York 2016-03-14 15:34:53 -07:00
parent 8e1b52392a fd489b8fd4
commit 450e6672a2
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bdns/dns.go
View File

@ -126,8 +126,8 @@ type DNSResolver interface {
// DNSResolverImpl represents a client that talks to an external resolver
type DNSResolverImpl struct {
DNSClient exchanger
Servers []string
dnsClient exchanger
servers []string
allowRestrictedAddresses bool
maxTries int
clk clock.Clock
@ -155,8 +155,8 @@ func NewDNSResolverImpl(readTimeout time.Duration, servers []string, stats metri
dnsClient.Net = "tcp"
return &DNSResolverImpl{
DNSClient: dnsClient,
Servers: servers,
dnsClient: dnsClient,
servers: servers,
allowRestrictedAddresses: false,
maxTries: maxTries,
clk: clk,
@ -188,16 +188,16 @@ func (dnsResolver *DNSResolverImpl) exchangeOne(ctx context.Context, hostname st
// Set DNSSEC OK bit for resolver
m.SetEdns0(4096, true)
if len(dnsResolver.Servers) < 1 {
if len(dnsResolver.servers) < 1 {
return nil, fmt.Errorf("Not configured with at least one DNS Server")
}
dnsResolver.stats.Inc("Rate", 1)
// Randomly pick a server
chosenServer := dnsResolver.Servers[rand.Intn(len(dnsResolver.Servers))]
chosenServer := dnsResolver.servers[rand.Intn(len(dnsResolver.servers))]
client := dnsResolver.DNSClient
client := dnsResolver.dnsClient
tries := 1
start := dnsResolver.clk.Now()

8
bdns/dns_test.go
View File

@ -453,7 +453,7 @@ func TestRetry(t *testing.T) {
for i, tc := range tests {
dr := NewTestDNSResolverImpl(time.Second*10, []string{dnsLoopbackAddr}, testStats, clock.NewFake(), tc.maxTries)
dr.DNSClient = tc.te
dr.dnsClient = tc.te
_, _, err := dr.LookupTXT(context.Background(), "example.com")
if err == errTooManyRequests {
t.Errorf("#%d, sent more requests than the test case handles", i)
@ -470,7 +470,7 @@ func TestRetry(t *testing.T) {
}
dr := NewTestDNSResolverImpl(time.Second*10, []string{dnsLoopbackAddr}, testStats, clock.NewFake(), 3)
dr.DNSClient = &testExchanger{errs: []error{isTempErr, isTempErr, nil}}
dr.dnsClient = &testExchanger{errs: []error{isTempErr, isTempErr, nil}}
ctx, cancel := context.WithCancel(context.Background())
cancel()
_, _, err := dr.LookupTXT(ctx, "example.com")
@ -479,7 +479,7 @@ func TestRetry(t *testing.T) {
t.Errorf("expected %s, got %s", context.Canceled, err)
}
dr.DNSClient = &testExchanger{errs: []error{isTempErr, isTempErr, nil}}
dr.dnsClient = &testExchanger{errs: []error{isTempErr, isTempErr, nil}}
ctx, _ = context.WithTimeout(context.Background(), -10*time.Hour)
_, _, err = dr.LookupTXT(ctx, "example.com")
if err == nil ||
@ -487,7 +487,7 @@ func TestRetry(t *testing.T) {
t.Errorf("expected %s, got %s", context.DeadlineExceeded, err)
}
dr.DNSClient = &testExchanger{errs: []error{isTempErr, isTempErr, nil}}
dr.dnsClient = &testExchanger{errs: []error{isTempErr, isTempErr, nil}}
ctx, deadlineCancel := context.WithTimeout(context.Background(), -10*time.Hour)
deadlineCancel()
_, _, err = dr.LookupTXT(ctx, "example.com")