TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns/publicdns: remove additional information in DOH URL passed to IPv6 address generation for controlD.

Browse Source 
This commit truncates any additional information (mainly hostnames) that's passed to controlD via DOH URL in DoHIPsOfBase.
This change is to make sure only resolverID is passed to controlDv6Gen but not the additional information.

Updates: #7946
Signed-off-by: KevinLiang10 <37811973+KevinLiang10@users.noreply.github.com>
This commit is contained in:
KevinLiang10 2024-07-10 15:28:03 -04:00
parent 041733d3d1
commit 8d7b78f3f7
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/dns/publicdns/publicdns.go
View File

@ -10,6 +10,7 @@
"encoding/binary" "encoding/binary"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"log"
"math/big" "math/big"
"net/netip" "net/netip"
"sort" "sort"
@ -122,6 +123,9 @@ func DoHIPsOfBase(dohBase string) []netip.Addr {
} }
} }
if pathStr, ok := strings.CutPrefix(dohBase, controlDBase); ok { if pathStr, ok := strings.CutPrefix(dohBase, controlDBase); ok {
if i := strings.IndexFunc(pathStr, isSlashOrQuestionMark); i != -1 {
pathStr = pathStr[:i]
}
return []netip.Addr{ return []netip.Addr{
controlDv4One, controlDv4One,
controlDv4Two, controlDv4Two,
@ -318,7 +322,10 @@ func nextDNSv6Gen(ip netip.Addr, id []byte) netip.Addr {
// e.g. https://dns.controld.com/hyq3ipr2ct // e.g. https://dns.controld.com/hyq3ipr2ct
func controlDv6Gen(ip netip.Addr, id string) netip.Addr { func controlDv6Gen(ip netip.Addr, id string) netip.Addr {
b := make([]byte, 8) b := make([]byte, 8)
decoded, _ := strconv.ParseUint(id, 36, 64) decoded, err := strconv.ParseUint(id, 36, 64)
if err != nil {
log.Printf("controlDv6Gen: failed to parse id %q: %v", id, err)
}
binary.BigEndian.PutUint64(b, decoded) binary.BigEndian.PutUint64(b, decoded)
a := ip.AsSlice() a := ip.AsSlice()
copy(a[6:14], b) copy(a[6:14], b)

9
net/dns/publicdns/publicdns_test.go
View File

@ -134,6 +134,15 @@ func TestDoHIPsOfBase(t *testing.T) {
"2606:1a40:1:ffff:ffff:ffff:ffff:0", "2606:1a40:1:ffff:ffff:ffff:ffff:0",
), ),
}, },
{
base: "https://dns.controld.com/hyq3ipr2ct/test-host-name",
want: ips(
"76.76.2.22",
"76.76.10.22",
"2606:1a40:0:6:7b5b:5949:35ad:0",
"2606:1a40:1:6:7b5b:5949:35ad:0",
),
},
} }
for _, tt := range tests { for _, tt := range tests {
got := DoHIPsOfBase(tt.base) got := DoHIPsOfBase(tt.base)