2025-08-19 14:44:24

Author: mohanson

daze.go

@@ -157,7 +157,12 @@ func (c Cdoh) Write(b []byte) (n int, err error) {
 // ResolverDoh returns a DoH resolver. For further information, see https://datatracker.ietf.org/doc/html/rfc8484.
 func ResolverDoh(addr string) *net.Resolver {
 	urls := doa.Try(url.Parse(addr))
-	urls.Host = doa.Try(net.LookupHost(urls.Hostname()))[0]
+	host := doa.Try(net.LookupHost(urls.Hostname()))[0]
+	port := urls.Port()
+	urls.Host = host
+	if port != "" {
+		urls.Host = host + ":" + port
+	}
 	return &net.Resolver{
 		PreferGo: true,
 		Dial: func(ctx context.Context, network, address string) (net.Conn, error) {

daze_test.go

@@ -12,6 +12,7 @@ import (
 const (
 	DazeServerListenOn = "127.0.0.1:28080"
 	CurlDest           = "https://www.zhihu.com"
+	HostLookup         = "google.com"
 )
 
 func TestLocaleHTTP(t *testing.T) {
@@ -64,23 +65,23 @@ func TestLocaleSocks5(t *testing.T) {
 
 func TestResolverDns(t *testing.T) {
 	dns := ResolverDns("1.1.1.1:53")
-	_, err := dns.LookupHost(context.Background(), "google.com")
+	_, err := dns.LookupHost(context.Background(), HostLookup)
 	if err != nil {
 		t.FailNow()
 	}
 }
 
 func TestResolverDot(t *testing.T) {
 	dot := ResolverDot("1.1.1.1:853")
-	_, err := dot.LookupHost(context.Background(), "google.com")
+	_, err := dot.LookupHost(context.Background(), HostLookup)
 	if err != nil {
 		t.FailNow()
 	}
 }
 
 func TestResolverDoh(t *testing.T) {
 	doh := ResolverDoh("https://1.1.1.1/dns-query")
-	_, err := doh.LookupHost(context.Background(), "google.com")
+	_, err := doh.LookupHost(context.Background(), HostLookup)
 	if err != nil {
 		t.FailNow()
 	}

protocol/etch/engine.go

@@ -5,18 +5,28 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"net/http/httputil"
+	"net/url"
+
+	"github.com/mohanson/daze/lib/doa"
 )
 
 // Server implemented the etch protocol.
 type Server struct {
 	Closer io.Closer
 	Listen string
+	Server string
 }
 
 // ServeHTTP implements http.Handler.
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	log.Println(w)
-	log.Println(r)
+	cloud := doa.Try(url.Parse(s.Server))
+	proxy := httputil.NewSingleHostReverseProxy(cloud)
+	proxy.Director = nil
+	proxy.Rewrite = func(r *httputil.ProxyRequest) {
+		r.SetURL(cloud)
+	}
+	proxy.ServeHTTP(w, r)
 }
 
 // Close listener.
@@ -41,8 +51,10 @@ func (s *Server) Run() error {
 }
 
 // NewServer returns a new Server.
-func NewServer(listen string) *Server {
+func NewServer(listen string, server string) *Server {
 	return &Server{
+		Closer: nil,
 		Listen: listen,
+		Server: server,
 	}
 }

protocol/etch/engine_test.go

@@ -0,0 +1,24 @@
+package etch
+
+import (
+	"context"
+	"testing"
+
+	"github.com/mohanson/daze"
+	"github.com/mohanson/daze/lib/doa"
+)
+
+const (
+	DazeServerListenOn = "127.0.0.1:28080"
+	Dest               = "https://1.1.1.1"
+	HostLookup         = "google.com"
+)
+
+func TestProtocolEtch(t *testing.T) {
+	server := NewServer(DazeServerListenOn, Dest)
+	server.Run()
+	defer server.Close()
+
+	client := daze.ResolverDoh("http://127.0.0.1:28080/dns-query")
+	doa.Try(client.LookupHost(context.Background(), HostLookup))
+}