rdns mvp

mosajjal · Nov 5, 2023 · d43b606 · d43b606
1 parent e70c51b
commit d43b606
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/deathowl/go-metrics-prometheus v0.0.0-20221009205350-f2a1482ba35b
-	github.com/folbricht/routedns v0.1.21-0.20231018071250-ad56f950afc7
+	github.com/folbricht/routedns v0.1.21-0.20231021081103-822f708e128c
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/gorilla/handlers v1.5.1
 	github.com/knadh/koanf v1.5.0

diff --git a/go.sum b/go.sum
@@ -65,6 +65,8 @@ github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBd
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/folbricht/routedns v0.1.21-0.20231018071250-ad56f950afc7 h1:dv4WpL4soh4cncVa2eSfHkAAFhLwNzMf5Eh4KBOtvms=
 github.com/folbricht/routedns v0.1.21-0.20231018071250-ad56f950afc7/go.mod h1:VflYkHNga8APcQZdm/Nh2fM27fPEit1+Rf6bHpxYimw=
+github.com/folbricht/routedns v0.1.21-0.20231021081103-822f708e128c h1:CEaurOJLP9yGt8VkfTXfbONIBEpJWf1uuTuIBi8lzXk=
+github.com/folbricht/routedns v0.1.21-0.20231021081103-822f708e128c/go.mod h1:VflYkHNga8APcQZdm/Nh2fM27fPEit1+Rf6bHpxYimw=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=

diff --git a/pkg/acl/acl_test.go b/pkg/acl/acl_test.go
@@ -20,38 +20,38 @@ acl:
   domain:
     enabled: true
     priority: 20
-    path: ../domains.csv
+    path: ../../domains.csv
     refresh_interval: 1h0m0s`,
 	"acl_cidr.yaml": `
 acl:
   cidr:
     enabled: true
     priority: 30
-    path: ../cidr.csv
+    path: ../../cidr.csv
     refresh_interval: 1h0m0s`,
 	"acl_domain_cidr.yaml": `
 acl:
   domain:
     enabled: true
     priority: 20
-    path: ../domains.csv
+    path: ../../domains.csv
     refresh_interval: 1h0m0s
   cidr:
     enabled: true
     priority: 30
-    path: ../cidr.csv
+    path: ../../cidr.csv
     refresh_interval: 1h0m0s`,
 	"acl_cidr_domain.yaml": `
 acl:
   domain:
     enabled: true
     priority: 20
-    path: ../domains.csv
+    path: ../../domains.csv
     refresh_interval: 1h0m0s
   cidr:
     enabled: true
     priority: 19
-    path: ../cidr.csv
+    path: ../../cidr.csv
     refresh_interval: 1h0m0s`,
 }
 

diff --git a/pkg/dns.go b/pkg/dns.go
@@ -221,7 +221,7 @@ func getDialerFromProxyURL(proxyURL *url.URL) (*rdns.Dialer, error) {
 	var dialer rdns.Dialer
 	// by default dialer is direct
 	dialer = &net.Dialer{}
-	if proxyURL != nil {
+	if proxyURL != nil && proxyURL.Host != "" {
 		// create a net dialer with proxy
 		var auth *proxy.Auth
 		if proxyURL.User != nil {
@@ -250,16 +250,22 @@ URI string could look like below:
   - quic://dns.adguard.com:8853
   - tcp-tls://dns.adguard.com:853
 */
-func NewDNSClient(C *Config, uri string, skipVerify bool, proxyURL *url.URL) (*DNSClient, error) {
-	// TODO: Proxy support is not yet implemented
+func NewDNSClient(C *Config, uri string, skipVerify bool, proxy string) (*DNSClient, error) {
 	parsedURL, err := url.Parse(uri)
 	if err != nil {
 		return nil, err
 	}
-	dialer, err := getDialerFromProxyURL(proxyURL)
+
+	var dialer *rdns.Dialer
+	proxyURL, err := url.Parse(proxy)
 	if err != nil {
 		return nil, err
 	}
+	dialer, err = getDialerFromProxyURL(proxyURL)
+	if err != nil {
+		return nil, err
+	}
+
 	switch parsedURL.Scheme {
 	case "udp", "udp6":
 		var host, port string
@@ -345,7 +351,7 @@ func NewDNSClient(C *Config, uri string, skipVerify bool, proxyURL *url.URL) (*D
 		opt := rdns.DoQClientOptions{
 			TLSConfig: tlsConfig,
 			LocalAddr: C.SourceAddr,
-			// Dialer:    *dialer, // TODO: wait for #317 in folbricht/routedns to add DoQ
+			// Dialer:    *dialer, // BUG: not yet supported
 		}
 		id, err := rdns.NewDoQClient("id", parsedURL.Host, opt)
 		if err != nil {

diff --git a/pkg/dns_test.go b/pkg/dns_test.go
@@ -3,18 +3,18 @@ package sniproxy
 import (
 	"net"
 	"testing"
-
-	"github.com/mosajjal/dnsclient"
 )
 
 func TestDNSClient_lookupDomain4(t *testing.T) {
-	tmp, err := dnsclient.New("udp://1.1.1.1:53", true, "")
+	c := Config{
+		UpstreamDNS: "tcp://1.1.1.1:53",
+	}
+	dnsc, err := NewDNSClient(&c, c.UpstreamDNS, true, "")
 	if err != nil {
 		t.Errorf("failed to set up DNS client")
 	}
-	dnsc := DNSClient{tmp, nil}
 	tests := []struct {
-		client  DNSClient
+		client  *DNSClient
 		name    string
 		domain  string
 		want    net.IP