Skip to content

desktop discovery: unmap IPv6 addresses #31227

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
zmb3 merged 3 commits into from
Sep 5, 2023
Merged

desktop discovery: unmap IPv6 addresses #31227

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2ff29b
desktop discovery: unmap IPv6 addresses
zmb3 Aug 29, 2023
c3a384c
Merge branch 'master' into zmb3/dns-ipv4-mapping
zmb3 Aug 31, 2023
af07131
Merge branch 'master' into zmb3/dns-ipv4-mapping
zmb3 Sep 5, 2023
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
10 changes: 9 additions & 1 deletion lib/srv/desktop/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,16 @@ func (s *WindowsService) lookupDesktop(ctx context.Context, hostname string) ([]
hostname, resolverName, err)
}

ch <- addrs
// even though we requested "ip4" it's possible to get IPv4
// addresses mapped to IPv6 addresses, so we unmap them here
result := make([]netip.Addr, 0, len(addrs))
for _, addr := range addrs {
if addr.Is4() || addr.Is4In6() {
result = append(result, addr.Unmap())
Copy link
Copy Markdown
Contributor

@espadolini espadolini Aug 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we worried about actual ipv6 addresses being returned here? We could just do addrs[i] = addrs[i].Unmap() if that's not the case, Unmap is a noop for ipv4 addresses.

Copy link
Copy Markdown
Collaborator Author

@zmb3 zmb3 Aug 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't worried about them showing up before and then we ran in to this bug, so I'd rather be extra defensive.

}
}

ch <- result
}()
return ch
}
Expand Down