Skip to content

[client] Fix IPv4-only in bind proxy #5154

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
lixmal merged 1 commit into from
Jan 23, 2026
Merged

[client] Fix IPv4-only in bind proxy #5154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions client/iface/wgproxy/bind/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,29 @@ func (p *ProxyBind) RedirectAs(endpoint *net.UDPAddr) {
p.pausedCond.L.Lock()
p.paused = false

p.wgCurrentUsed = addrToEndpoint(endpoint)
ep, err := addrToEndpoint(endpoint)
if err != nil {
log.Errorf("failed to convert endpoint address: %v", err)
Copy link
Copy Markdown
Collaborator

@pappz pappz Jan 22, 2026

Choose a reason for hiding this comment

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

The address validation is on wrong place and handled in incorrect way.
If the endpoint is nil throw and panic. Never allowed to be nil!

Copy link
Copy Markdown
Collaborator Author

@lixmal lixmal Jan 22, 2026

Choose a reason for hiding this comment

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

Yeah, it'll stick to the old endpoint in that case

Copy link
Copy Markdown
Collaborator

@pappz pappz Jan 23, 2026

Choose a reason for hiding this comment

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

That is wrong. The address to endpoint must to work without error. In this scope the error is not acceptable path.

Copy link
Copy Markdown
Collaborator Author

@lixmal lixmal Jan 23, 2026

Choose a reason for hiding this comment

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

The error was completely ignored before. How would you like to handle it?

Copy link
Copy Markdown
Collaborator

@pappz pappz Jan 23, 2026

Choose a reason for hiding this comment

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

The first expectation is that the endpoint should not be nil. If it is nil, a panic should be thrown. If the addr nor ipv4 nor ipv6 a panic should also be thrown. Another option is to pass the addr instead of the endpoint.

} else {
p.wgCurrentUsed = ep
}

p.pausedCond.Signal()
p.pausedCond.L.Unlock()
}

func addrToEndpoint(addr *net.UDPAddr) *bind.Endpoint {
ip, _ := netip.AddrFromSlice(addr.IP.To4())
addrPort := netip.AddrPortFrom(ip, uint16(addr.Port))
return &bind.Endpoint{AddrPort: addrPort}
func addrToEndpoint(addr *net.UDPAddr) (*bind.Endpoint, error) {
if addr == nil {
return nil, errors.New("nil address")
}

ip, ok := netip.AddrFromSlice(addr.IP)
if !ok {
return nil, fmt.Errorf("convert %s to netip.Addr", addr)
}

addrPort := netip.AddrPortFrom(ip.Unmap(), uint16(addr.Port))
return &bind.Endpoint{AddrPort: addrPort}, nil
}

func (p *ProxyBind) CloseConn() error {
Expand Down
4 changes: 3 additions & 1 deletion client/iface/wgproxy/ebpf/wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ func (p *ProxyWrapper) RedirectAs(endpoint *net.UDPAddr) {
p.pausedCond.L.Lock()
p.paused = false

p.wgEndpointCurrentUsedAddr = endpoint
if endpoint != nil && endpoint.IP != nil {
p.wgEndpointCurrentUsedAddr = endpoint
}

p.pausedCond.Signal()
p.pausedCond.L.Unlock()
Expand Down
Loading