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

Merge pull request #202 from ncw/fix-197-FEAT

Browse Source 
Implement PRET command for distributed ftp servers, eg drftpd
This commit is contained in:
Julien Laffaye 2020-10-19 13:47:21 -04:00 committed by GitHub
commit a50ad6ffd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ftp.go
View File

@ -38,6 +38,7 @@ type ServerConn struct {
features map[string]string features map[string]string
skipEPSV bool skipEPSV bool
mlstSupported bool mlstSupported bool
usePRET bool
} }
// DialOption represents an option to start a new connection with Dial // DialOption represents an option to start a new connection with Dial
@ -280,6 +281,9 @@ func (c *ServerConn) Login(user, password string) error {
if _, mlstSupported := c.features["MLST"]; mlstSupported { if _, mlstSupported := c.features["MLST"]; mlstSupported {
c.mlstSupported = true c.mlstSupported = true
} }
if _, usePRET := c.features["PRET"]; usePRET {
c.usePRET = true
}
// Switch to binary mode // Switch to binary mode
if _, _, err = c.cmd(StatusCommandOK, "TYPE I"); err != nil { if _, _, err = c.cmd(StatusCommandOK, "TYPE I"); err != nil {
@ -486,6 +490,15 @@ func (c *ServerConn) cmd(expected int, format string, args ...interface{}) (int,
// cmdDataConnFrom executes a command which require a FTP data connection. // cmdDataConnFrom executes a command which require a FTP data connection.
// Issues a REST FTP command to specify the number of bytes to skip for the transfer. // Issues a REST FTP command to specify the number of bytes to skip for the transfer.
func (c *ServerConn) cmdDataConnFrom(offset uint64, format string, args ...interface{}) (net.Conn, error) { func (c *ServerConn) cmdDataConnFrom(offset uint64, format string, args ...interface{}) (net.Conn, error) {
// If server requires PRET send the PRET command to warm it up
// See: https://tools.ietf.org/html/draft-dd-pret-00
if c.usePRET {
_, _, err := c.cmd(-1, "PRET "+format, args...)
if err != nil {
return nil, err
}
}
conn, err := c.openDataConn() conn, err := c.openDataConn()
if err != nil { if err != nil {
return nil, err return nil, err