Skip to content

Allow Doh addresses with ports #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mohanson merged 3 commits into from
Aug 19, 2025
Merged

Allow Doh addresses with ports #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cfcb37
2025-08-19 10:12:54
mohanson Aug 19, 2025
3dd8e84
2025-08-19 14:44:24
mohanson Aug 19, 2025
fd53391
2025-08-19 17:16:28
mohanson Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion daze.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 4 additions & 3 deletions daze_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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()
}
Expand Down