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

Use net.IP instead of netip.Addr

Browse Source
This commit is contained in:
Tamás Gulácsi 2022-08-17 18:53:01 +02:00
parent fa01896d67
commit 07e23fe051
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ftp.go
View File

@ -10,7 +10,6 @@ import (
"errors" "errors"
"io" "io"
"net" "net"
"net/netip"
"net/textproto" "net/textproto"
"strconv" "strconv"
"strings" "strings"
@ -500,12 +499,9 @@ func (c *ServerConn) pasv() (host string, port int, err error) {
host = strings.Join(pasvData[0:4], ".") host = strings.Join(pasvData[0:4], ".")
if c.host != host { if c.host != host {
if cmdIP, err := netip.ParseAddr(c.host); err == nil { if cmdIP := net.ParseIP(c.host); cmdIP != nil {
if dataIP, err := netip.ParseAddr(host); err == nil { if dataIP := net.ParseIP(host); dataIP != nil {
// Logic stolen from lftp (https://github.com/lavv17/lftp/blob/d67fc14d085849a6b0418bb3e912fea2e94c18d1/src/ftpclass.cc#L769) if isBogusDataIP(cmdIP, dataIP) {
if dataIP.IsMulticast() ||
cmdIP.IsPrivate() != dataIP.IsPrivate() ||
cmdIP.IsLoopback() != dataIP.IsLoopback() {
return c.host, port, nil return c.host, port, nil
} }
} }
@ -514,6 +510,13 @@ func (c *ServerConn) pasv() (host string, port int, err error) {
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) {