brouzouf/ftp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from lfreijo/fix-passive-mode-for-proxies

Browse Source 
Fix for proxies in passive mode
This commit is contained in:
Logan Freijo 2024-04-12 11:30:57 -04:00 committed by GitHub
commit 6e8e713355
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ftp.go
View File

@ -8,6 +8,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"errors" "errors"
"fmt"
"io" "io"
"net" "net"
"net/textproto" "net/textproto"
@ -144,21 +145,33 @@ func Dial(addr string, options ...DialOption) (*ServerConn, error) {
} }
} }
tconn, err := dialFunc("tcp", addr) // Use the resolved IP address in case addr contains a domain name
// If we use the domain name, we might not resolve to the same IP.
dnsResolver := net.Resolver{
Dial: func(ctx context.Context, network string, address string) (net.Conn, error) {
return dialFunc(network, address)
},
}
host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
addrs, err := dnsResolver.LookupIPAddr(context.Background(), host)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Use the resolved IP address in case addr contains a domain name tconn, err := dialFunc("tcp", fmt.Sprintf("%s:%s", addrs[0].IP.String(), port))
// If we use the domain name, we might not resolve to the same IP. if err != nil {
remoteAddr := tconn.RemoteAddr().(*net.TCPAddr) return nil, err
}
c := &ServerConn{ c := &ServerConn{
options: do, options: do,
features: make(map[string]string), features: make(map[string]string),
conn: textproto.NewConn(do.wrapConn(tconn)), conn: textproto.NewConn(do.wrapConn(tconn)),
netConn: tconn, netConn: tconn,
host: remoteAddr.IP.String(), host: addrs[0].IP.String(),
} }
_, _, err = c.conn.ReadResponse(StatusReady) _, _, err = c.conn.ReadResponse(StatusReady)
@ -528,26 +541,9 @@ func (c *ServerConn) pasv() (host string, port int, err error) {
// Make the IP address to connect to // Make the IP address to connect to
host = strings.Join(pasvData[0:4], ".") host = strings.Join(pasvData[0:4], ".")
if c.host != host {
if cmdIP := net.ParseIP(c.host); cmdIP != nil {
if dataIP := net.ParseIP(host); dataIP != nil {
if isBogusDataIP(cmdIP, dataIP) {
return c.host, port, nil
}
}
}
}
return host, port, nil return host, port, nil
} }
func isBogusDataIP(cmdIP, dataIP net.IP) bool {
// Logic stolen from lftp (https://github.com/lavv17/lftp/blob/d67fc14d085849a6b0418bb3e912fea2e94c18d1/src/ftpclass.cc#L769)
return dataIP.IsMulticast() ||
cmdIP.IsPrivate() != dataIP.IsPrivate() ||
cmdIP.IsLoopback() != dataIP.IsLoopback()
}
// getDataConnPort returns a host, port for a new data connection // getDataConnPort returns a host, port for a new data connection
// it uses the best available method to do so // it uses the best available method to do so
func (c *ServerConn) getDataConnPort() (string, int, error) { func (c *ServerConn) getDataConnPort() (string, int, error) {