Skip to content

Commit 45d91b8

Browse files
committed
fixing test
1 parent 781141a commit 45d91b8

File tree

5 files changed

+29
-6
lines changed

5 files changed

+29
-6
lines changed

fastdialer/dialer.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bytes"
55
"context"
66
"crypto/tls"
7+
"encoding/gob"
78
"encoding/json"
89
"fmt"
910
"net"
@@ -15,6 +16,7 @@ import (
1516

1617
"github.com/Mzack9999/gcache"
1718
gounit "github.com/docker/go-units"
19+
"github.com/miekg/dns"
1820
"github.com/projectdiscovery/hmap/store/hybrid"
1921
"github.com/projectdiscovery/networkpolicy"
2022
"github.com/projectdiscovery/retryabledns"
@@ -50,6 +52,25 @@ func init() {
5052
}
5153
MaxDNSCacheSize = maxDnsCacheSize
5254
MaxDNSItems = env.GetEnvOrDefault("MAX_DNS_ITEMS", 1024)
55+
56+
// Register DNS types with gob encoder
57+
gob.Register(&dns.SOA{})
58+
gob.Register(&dns.A{})
59+
gob.Register(&dns.AAAA{})
60+
gob.Register(&dns.CNAME{})
61+
gob.Register(&dns.MX{})
62+
gob.Register(&dns.NS{})
63+
gob.Register(&dns.PTR{})
64+
gob.Register(&dns.SRV{})
65+
gob.Register(&dns.TXT{})
66+
gob.Register(&dns.CAA{})
67+
gob.Register(&dns.DNSKEY{})
68+
gob.Register(&dns.DS{})
69+
gob.Register(&dns.NSEC{})
70+
gob.Register(&dns.NSEC3{})
71+
gob.Register(&dns.RRSIG{})
72+
gob.Register(&dns.TLSA{})
73+
gob.Register(&dns.OPT{})
5374
}
5475

5576
// Dialer structure containing data information

fastdialer/dialer_private.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ func (d *Dialer) dial(ctx context.Context, opts *dialOptions) (conn net.Conn, er
114114
cacheData, err, _ := d.resolutionsGroup.Do(hostname, func() (interface{}, error) {
115115
return d.GetDNSData(hostname)
116116
})
117-
118117
if cacheData == nil {
119118
return nil, ResolveHostError
120119
}

fastdialer/dialer_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestDialer(t *testing.T) {
2020
testDialer(t, options)
2121

2222
// disk
23-
options.CacheType = Hybrid
23+
options.CacheType = Disk
2424
options.CacheMemoryMaxItems = 100
2525
testDialer(t, options)
2626

@@ -32,25 +32,28 @@ func testDialer(t *testing.T, options Options) {
3232
fd, err := NewDialer(options)
3333
if err != nil {
3434
t.Errorf("couldn't create fastdialer instance: %s", err)
35+
return
3536
}
37+
defer fd.Close()
3638

3739
// valid resolution + cache
3840
ctx := context.Background()
3941
conn, err := fd.Dial(ctx, "tcp", "www.projectdiscovery.io:80")
4042
if err != nil || conn == nil {
4143
t.Errorf("couldn't connect to target: %s", err)
44+
return
4245
}
4346
if err := conn.Close(); err != nil {
4447
t.Errorf("failed to close connection: %s", err)
48+
return
4549
}
4650
// retrieve cached data
4751
data, err := fd.GetDNSData("www.projectdiscovery.io")
4852
if err != nil || data == nil {
4953
t.Errorf("couldn't retrieve dns data: %s", err)
54+
return
5055
}
5156
if len(data.A) == 0 {
5257
t.Error("no A results found")
5358
}
54-
// cleanup
55-
fd.Close()
5659
}

fastdialer/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ var DefaultOptions = Options{
7676
MaxRetries: 5,
7777
HostsFile: true,
7878
ResolversFile: true,
79-
CacheType: Disk,
79+
CacheType: Memory,
8080
DialerTimeout: 10 * time.Second,
8181
DialerKeepAlive: 10 * time.Second,
8282
MaxTemporaryErrors: 30,

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ require (
66
github.com/Mzack9999/gcache v0.0.0-20230410081825-519e28eab057
77
github.com/dimchansky/utfbom v1.1.1
88
github.com/docker/go-units v0.5.0
9+
github.com/miekg/dns v1.1.62
910
github.com/projectdiscovery/goleak v0.0.0-20240729222606-a7d18edc33f8
1011
github.com/projectdiscovery/hmap v0.0.92
1112
github.com/projectdiscovery/networkpolicy v0.1.20
@@ -34,7 +35,6 @@ require (
3435
github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
3536
github.com/mattn/go-isatty v0.0.20 // indirect
3637
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
37-
github.com/miekg/dns v1.1.62 // indirect
3838
github.com/onsi/gomega v1.27.6 // indirect
3939
github.com/pkg/errors v0.9.1 // indirect
4040
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

0 commit comments

Comments
 (0)