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

wgengine: avoid v6 mapped v4 IPs when converting to netaddr types.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-05-08 23:31:31 +00:00
parent 74d6ab995d
commit ccbd0937d0
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wgengine/userspace.go
View File

@ -417,10 +417,20 @@ func (e *userspaceEngine) Reconfig(cfg *wgcfg.Config, dnsDomains []string, local
func wgIPToNetaddr(ips []wgcfg.IP) (ret []netaddr.IP) { func wgIPToNetaddr(ips []wgcfg.IP) (ret []netaddr.IP) {
for _, ip := range ips { for _, ip := range ips {
nip, ok := netaddr.FromStdIP(ip.IP()) stdip := ip.IP()
// Force IPv4 addresses into their 4-byte representation,
// because netaddr.FromStdIP will use whatever the underlying
// address encoding is - which can lead to creating a v6
// mapped v4 address and breaking everything downstream that
// expects a regular IPv4.
if stdip4 := stdip.To4(); stdip4 != nil {
stdip = stdip4
}
nip, ok := netaddr.FromStdIP(stdip)
if !ok { if !ok {
panic(fmt.Sprintf("conversion of %s from wgcfg to netaddr IP failed", ip)) panic(fmt.Sprintf("conversion of %s from wgcfg to netaddr IP failed", ip))
} }
log.Println(nip)
ret = append(ret, nip) ret = append(ret, nip)
} }
return ret return ret
@ -428,7 +438,16 @@ func wgIPToNetaddr(ips []wgcfg.IP) (ret []netaddr.IP) {
func wgCIDRToNetaddr(cidrs []wgcfg.CIDR) (ret []netaddr.IPPrefix) { func wgCIDRToNetaddr(cidrs []wgcfg.CIDR) (ret []netaddr.IPPrefix) {
for _, cidr := range cidrs { for _, cidr := range cidrs {
ncidr, ok := netaddr.FromStdIPNet(cidr.IPNet()) stdipnet := cidr.IPNet()
// Force IPv4 addresses into their 4-byte representation,
// because netaddr.FromStdIP will use whatever the underlying
// address encoding is - which can lead to creating a v6
// mapped v4 address and breaking everything downstream that
// expects a regular IPv4.
if ip4 := stdipnet.IP.To4(); ip4 != nil {
stdipnet.IP = ip4
}
ncidr, ok := netaddr.FromStdIPNet(stdipnet)
if !ok { if !ok {
panic(fmt.Sprintf("conversion of %s from wgcfg to netaddr IPNet failed", cidr)) panic(fmt.Sprintf("conversion of %s from wgcfg to netaddr IPNet failed", cidr))
} }