kayos/go-socks5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix panic when target.LocalAddr() is not *net.TCPAddr

Browse Source 
This happens when you use custom dialer that returns custom net.Conn
that returns a non-*net.TCPAddr net.Addr for LocalAddr() calls.

For example, if you dial through an SSH connection,
it might be difficult to figure out remote local address,
so you return a stub instead.
This commit is contained in:
mo 2020-04-19 17:57:30 +08:00
parent d86385b825
commit f87199c59e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
request.go
View File

@ -190,9 +190,7 @@ func (s *Server) handleConnect(ctx context.Context, conn conn, req *Request) err
defer target.Close()
// Send success
local := target.LocalAddr().(*net.TCPAddr)
bind := AddrSpec{IP: local.IP, Port: local.Port}
if err := sendReply(conn, successReply, &bind); err != nil {
if err := sendReply(conn, successReply, addrSpecFromNetAddr(target.LocalAddr())); err != nil {
return fmt.Errorf("Failed to send reply: %v", err)
}
@ -302,6 +300,13 @@ func readAddrSpec(r io.Reader) (*AddrSpec, error) {
return d, nil
}
func addrSpecFromNetAddr(addr net.Addr) *AddrSpec {
if tcpAddr, ok := addr.(*net.TCPAddr); ok {
return &AddrSpec{IP: tcpAddr.IP, Port: tcpAddr.Port}
}
return nil
}
// sendReply is used to send a reply message
func sendReply(w io.Writer, resp uint8, addr *AddrSpec) error {
// Format the address