CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-08-23 01:27:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: bracket IPv6 addresses in VPN DNS upstream config

Browse Source 
upstreamConfigFor() used strings.Contains(":") to detect whether to
append ":53", but IPv6 addresses contain colons, so IPv6 servers were
passed as bare addresses (e.g. "2a0d:6fc0:9b0:3600::1") to net.Dial
which rejects them with "too many colons in address".

Use net.JoinHostPort() which handles both IPv4 and IPv6 correctly,
producing "[2a0d:6fc0:9b0:3600::1]:53" for IPv6.
This commit is contained in:
Codescribe
2026-04-01 17:23:53 +07:00
committed by Cuong Manh Le
parent 5c0585b2e8
commit 95dd871e2d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/cli/vpn_dns.go
+7 -4
View File
@@ -2,6 +2,7 @@ package cli
import ( import (
"context" "context"
"net"
"strings" "strings"
"sync" "sync"
@@ -241,10 +242,12 @@ func (m *vpnDNSManager) Routes() map[string][]string {
// upstreamConfigFor creates a legacy upstream configuration for the given VPN DNS server. // upstreamConfigFor creates a legacy upstream configuration for the given VPN DNS server.
func (m *vpnDNSManager) upstreamConfigFor(server string) *ctrld.UpstreamConfig { func (m *vpnDNSManager) upstreamConfigFor(server string) *ctrld.UpstreamConfig {
endpoint := server // Use net.JoinHostPort to correctly handle both IPv4 and IPv6 addresses.
if !strings.Contains(server, ":") { // Previously, the strings.Contains(":") check would skip appending ":53"
endpoint = server + ":53" // for IPv6 addresses (they contain colons), leaving a bare address like
} // "2a0d:6fc0:9b0:3600::1" which net.Dial rejects with "too many colons".
// net.JoinHostPort produces "[2a0d:6fc0:9b0:3600::1]:53" as required.
endpoint := net.JoinHostPort(server, "53")
return &ctrld.UpstreamConfig{ return &ctrld.UpstreamConfig{
Name: "VPN DNS", Name: "VPN DNS",