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

Add a DialWithDisabledMLSD option to ignore MLSD if advertised

Browse Source 
This is useful for servers which advertise MLSD (eg some versions of
Serv-U) but don't support it properly.
This commit is contained in:
Nick Craig-Wood 2020-09-04 18:03:54 +01:00
parent 0de5c29d45
commit 624bcac8b4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ftp.go
View File

@ -55,6 +55,7 @@ type dialOptions struct {
conn net.Conn conn net.Conn
disableEPSV bool disableEPSV bool
disableUTF8 bool disableUTF8 bool
disableMLSD bool
location *time.Location location *time.Location
debugOutput io.Writer debugOutput io.Writer
dialFunc func(network, address string) (net.Conn, error) dialFunc func(network, address string) (net.Conn, error)
@ -175,6 +176,16 @@ func DialWithDisabledUTF8(disabled bool) DialOption {
}} }}
} }
// DialWithDisabledMLSD returns a DialOption that configures the ServerConn with MLSD option disabled
//
// This is useful for servers which advertise MLSD (eg some versions
// of Serv-U) but don't support it properly.
func DialWithDisabledMLSD(disabled bool) DialOption {
return DialOption{func(do *dialOptions) {
do.disableMLSD = disabled
}}
}
// DialWithLocation returns a DialOption that configures the ServerConn with specified time.Location // DialWithLocation returns a DialOption that configures the ServerConn with specified time.Location
// The location is used to parse the dates sent by the server which are in server's timezone // The location is used to parse the dates sent by the server which are in server's timezone
func DialWithLocation(location *time.Location) DialOption { func DialWithLocation(location *time.Location) DialOption {
@ -278,7 +289,7 @@ func (c *ServerConn) Login(user, password string) error {
if err != nil { if err != nil {
return err return err
} }
if _, mlstSupported := c.features["MLST"]; mlstSupported { if _, mlstSupported := c.features["MLST"]; mlstSupported && !c.options.disableMLSD {
c.mlstSupported = true c.mlstSupported = true
} }
if _, usePRET := c.features["PRET"]; usePRET { if _, usePRET := c.features["PRET"]; usePRET {