Respect timeout option when using DNS over HTTPS (DOH)

client.go

@@ -16,6 +16,7 @@ import (
 	"github.com/projectdiscovery/iputil"
 	"github.com/projectdiscovery/retryabledns/doh"
 	"github.com/projectdiscovery/retryabledns/hostsfile"
+	"github.com/projectdiscovery/retryablehttp-go"
 )
 
 func init() {
@@ -47,12 +48,18 @@ func NewWithOptions(options Options) *Client {
 	if options.Hostsfile {
 		knownHosts, _ = hostsfile.ParseDefault()
 	}
+	httpOptions := retryablehttp.DefaultOptionsSingle
+	httpOptions.Timeout = options.Timeout
 	client := Client{
-		options:    options,
-		resolvers:  parsedBaseResolvers,
-		udpClient:  &dns.Client{Net: "", Timeout: options.Timeout},
-		tcpClient:  &dns.Client{Net: TCP.String(), Timeout: options.Timeout},
-		dohClient:  doh.New(),
+		options:   options,
+		resolvers: parsedBaseResolvers,
+		udpClient: &dns.Client{Net: "", Timeout: options.Timeout},
+		tcpClient: &dns.Client{Net: TCP.String(), Timeout: options.Timeout},
+		dohClient: doh.NewWithOptions(
+			doh.Options{
+				HttpClient: retryablehttp.NewClient(httpOptions),
+			},
+		),
 		dotClient:  &dns.Client{Net: "tcp-tls", Timeout: options.Timeout},
 		knownHosts: knownHosts,
 	}

doh/doh_client.go

@@ -18,11 +18,11 @@ type Client struct {
 }
 
 func NewWithOptions(options Options) *Client {
-	return &Client{DefaultResolver: options.DefaultResolver, httpClient: options.httpClient}
+	return &Client{DefaultResolver: options.DefaultResolver, httpClient: options.HttpClient}
 }
 
 func New() *Client {
-	return NewWithOptions(Options{DefaultResolver: Cloudflare, httpClient: retryablehttp.NewClient(retryablehttp.DefaultOptionsSingle)})
+	return NewWithOptions(Options{DefaultResolver: Cloudflare, HttpClient: retryablehttp.NewClient(retryablehttp.DefaultOptionsSingle)})
 }
 
 func (c *Client) Query(name string, question QuestionType) (*Response, error) {

doh/options.go

@@ -9,7 +9,7 @@ import (
 
 type Options struct {
 	DefaultResolver Resolver
-	httpClient      *retryablehttp.Client
+	HttpClient      *retryablehttp.Client
 }
 
 type Resolver struct {