diff --git a/README.md b/README.md index 32604ac..3ecb881 100644 --- a/README.md +++ b/README.md @@ -19,5 +19,6 @@ Pull requests or feature requests are welcome, but in the case of the former, yo ### Tests ### How to run tests (windows not supported): +* do not use the "root" account, use an unprivileged user with write access to the root goftp directory * ```./build_test_server.sh``` from root goftp directory (this downloads and compiles pure-ftpd and proftpd) * ```go test``` from the root goftp directory diff --git a/build_test_server.sh b/build_test_server.sh index b086940..f718353 100755 --- a/build_test_server.sh +++ b/build_test_server.sh @@ -84,7 +84,7 @@ VpOorURz8ETlfAA= -----END CERTIFICATE----- CERT -curl -O http://download.pureftpd.org/pub/pure-ftpd/releases/obsolete/pure-ftpd-1.0.36.tar.gz +curl -k -O https://download.pureftpd.org/pub/pure-ftpd/releases/obsolete/pure-ftpd-1.0.36.tar.gz tar -xzf pure-ftpd-1.0.36.tar.gz cd pure-ftpd-1.0.36 diff --git a/client.go b/client.go index e488d07..46a8c37 100644 --- a/client.go +++ b/client.go @@ -417,6 +417,24 @@ func (c *Client) openConn(idx int, host string) (pconn *persistentConn, err erro goto Error } + if pconn.hasFeature("CLNT") { + if err = pconn.setClient(); err != nil { + goto Error + } + } + + if pconn.hasFeature("UTF8") { + if err = pconn.setUnicode(); err != nil { + goto Error + } + } + + if pconn.hasFeature("MLST") { + if err = pconn.setMLST(); err != nil { + goto Error + } + } + c.mu.Lock() defer c.mu.Unlock() diff --git a/file_system.go b/file_system.go index d80bf40..9cd3cae 100644 --- a/file_system.go +++ b/file_system.go @@ -112,6 +112,27 @@ func (c *Client) Getwd() (string, error) { return dir, nil } +// Setwd changes the current working directory. +func (c *Client) Setwd(path string) (error) { + pconn, err := c.getIdleConn() + if err != nil { + return err + } + + defer c.returnConn(pconn) + + code, msg, err := pconn.sendCommand("CWD %s", path) + if err != nil { + return err + } + + if code != replyFileActionOkay { + return ftpError{code: code, msg: msg} + } + + return nil +} + func commandNotSupporterdError(err error) bool { respCode := err.(ftpError).Code() return respCode == replyCommandSyntaxError || respCode == replyCommandNotImplemented @@ -125,16 +146,27 @@ func commandNotSupporterdError(err error) bool { // be used. You may have to set ServerLocation in your config to get (more) // accurate ModTimes in this case. func (c *Client) ReadDir(path string) ([]os.FileInfo, error) { - entries, err := c.dataStringList("MLSD %s", path) + pconn, err := c.getIdleConn() + if err != nil { + return nil, err + } + defer c.returnConn(pconn) + + var entries []string + + if !pconn.mlsdNotSupported { + entries, err = c.dataStringList(pconn, "MLSD %s", path) + } parser := parseMLST - if err != nil { - if !commandNotSupporterdError(err) { + if pconn.mlsdNotSupported || err != nil { + if !pconn.mlsdNotSupported && !commandNotSupporterdError(err) { return nil, err } + pconn.mlsdNotSupported = true - entries, err = c.dataStringList("LIST %s", path) + entries, err = c.dataStringList(pconn, "LIST %s", path) if err != nil { return nil, err } @@ -148,7 +180,9 @@ func (c *Client) ReadDir(path string) ([]os.FileInfo, error) { info, err := parser(entry, true) if err != nil { c.debug("error in ReadDir: %s", err) - return nil, err + if !strings.Contains(err.Error(), "incomplete") { + return nil, err + } } if info == nil { @@ -167,10 +201,17 @@ func (c *Client) ReadDir(path string) ([]os.FileInfo, error) { // is a directory. You may have to set ServerLocation in your config to get // (more) accurate ModTimes when using "LIST". func (c *Client) Stat(path string) (os.FileInfo, error) { - lines, err := c.controlStringList("MLST %s", path) + pconn, err := c.getIdleConn() + if err != nil { + return nil, err + } + + defer c.returnConn(pconn) + + lines, err := c.controlStringList(pconn, "MLST %s", path) if err != nil { if commandNotSupporterdError(err) { - lines, err = c.dataStringList("LIST %s", path) + lines, err = c.dataStringList(pconn, "LIST %s", path) if err != nil { return nil, err } @@ -202,17 +243,10 @@ func extractDirName(msg string) (string, error) { return strings.Replace(msg[openQuote+1:closeQuote], `""`, `"`, -1), nil } -func (c *Client) controlStringList(f string, args ...interface{}) ([]string, error) { - pconn, err := c.getIdleConn() - if err != nil { - return nil, err - } - - defer c.returnConn(pconn) - +func (c *Client) controlStringList(pconn *persistentConn, f string, args ...interface{}) ([]string, error) { cmd := fmt.Sprintf(f, args...) - code, msg, err := pconn.sendCommand(cmd) + code, msg, _ := pconn.sendCommand(cmd) if !positiveCompletionReply(code) { pconn.debug("unexpected response to %s: %d-%s", cmd, code, msg) @@ -222,14 +256,7 @@ func (c *Client) controlStringList(f string, args ...interface{}) ([]string, err return strings.Split(msg, "\n"), nil } -func (c *Client) dataStringList(f string, args ...interface{}) ([]string, error) { - pconn, err := c.getIdleConn() - if err != nil { - return nil, err - } - - defer c.returnConn(pconn) - +func (c *Client) dataStringList(pconn *persistentConn, f string, args ...interface{}) ([]string, error) { dcGetter, err := pconn.prepareDataConn() if err != nil { return nil, err @@ -321,6 +348,66 @@ func (f *ftpFile) Sys() interface{} { return f.raw } +var dirRegex = regexp.MustCompile(`^\s*(\S+\s+\S+\s{0,1}\S{2})\s+(\S+)\s+(.*)`) +var dirTimeFormats = []string{ + "01-02-06 03:04", + "01-02-06 03:04PM", + "2006-01-02 15:04", +} + +// 08/03/2016 17:13 directory-name +// 08/07/2016 17:20 1,135 file-name +// or +// 02-10-16 12:10PM 1067784 file.exe +func parseDirLIST(entry string, loc *time.Location, skipSelfParent bool) (os.FileInfo, error) { + matches := dirRegex.FindStringSubmatch(entry) + + if len(matches) == 0 { + return nil, ftpError{err: fmt.Errorf(`failed parsing LIST entry: %s`, entry)} + } + + if skipSelfParent && (matches[3] == "." || matches[3] == "..") { + return nil, nil + } + + var err error + + var size uint64 + var mode os.FileMode = 0400 + if strings.Contains(matches[2], "DIR") { + mode |= os.ModeDir + } else { + size, err = strconv.ParseUint(matches[2], 10, 64) + if err != nil { + return nil, ftpError{err: fmt.Errorf(`failed parsing LIST entry's size: %s (%s)`, err, entry)} + } + } + + var mtime time.Time + for _, format := range dirTimeFormats { + if len(entry) >= len(format) { + mtime, err = time.ParseInLocation(format, matches[1], loc) + if err == nil { + break + } + } + } + + if err != nil { + return nil, ftpError{err: fmt.Errorf(`failed parsing LIST entry's mtime: %s (%s)`, err, entry)} + } + + info := &ftpFile{ + name: filepath.Base(matches[3]), + mode: mode, + mtime: mtime, + raw: entry, + size: int64(size), + } + + return info, nil +} + var lsRegex = regexp.MustCompile(`^\s*(\S)(\S{3})(\S{3})(\S{3})(?:\s+\S+){3}\s+(\d+)\s+(\w+\s+\d+)\s+([\d:]+)\s+(.+)$`) // total 404456 @@ -332,7 +419,8 @@ func parseLIST(entry string, loc *time.Location, skipSelfParent bool) (os.FileIn matches := lsRegex.FindStringSubmatch(entry) if len(matches) == 0 { - return nil, ftpError{err: fmt.Errorf(`failed parsing LIST entry: %s`, entry)} + info, err := parseDirLIST(entry, loc, skipSelfParent) + return info, err } if skipSelfParent && (matches[8] == "." || matches[8] == "..") { @@ -400,7 +488,7 @@ func parseMLST(entry string, skipSelfParent bool) (os.FileInfo, error) { parseError := ftpError{err: fmt.Errorf(`failed parsing MLST entry: %s`, entry)} incompleteError := ftpError{err: fmt.Errorf(`MLST entry incomplete: %s`, entry)} - parts := strings.Split(entry, "; ") + parts := strings.SplitN(entry, "; ", 2) if len(parts) != 2 { return nil, parseError } @@ -420,7 +508,7 @@ func parseMLST(entry string, skipSelfParent bool) (os.FileInfo, error) { return nil, incompleteError } - if skipSelfParent && (typ == "cdir" || typ == "pdir" || typ == "." || typ == "..") { + if skipSelfParent && (typ == "cdir" || typ == "pdir" || typ == "." || typ == ".."|| parts[1] == "." || parts[1] == "..") { return nil, nil } diff --git a/persistent_connection.go b/persistent_connection.go index 2b8d7b3..2aa1b93 100644 --- a/persistent_connection.go +++ b/persistent_connection.go @@ -63,6 +63,9 @@ type persistentConn struct { // remember EPSV support epsvNotSupported bool + // remember MLSD support + mlsdNotSupported bool + // tracks the current type (e.g. ASCII/Image) of connection currentType string @@ -177,6 +180,17 @@ func (pconn *persistentConn) readResponse() (int, string, error) { err: fmt.Errorf("error reading response: %s", err), temporary: true, } + } else if code == replyConnectionClosed { + pconn.controlConn.SetReadDeadline(time.Now().Add(pconn.config.Timeout)) + code, msg, err = pconn.reader.ReadResponse(0) + if err != nil { + pconn.broken = true + pconn.debug("error reading second response: %s", err) + err = ftpError{ + err: fmt.Errorf("error reading response: %s", err), + temporary: true, + } + } } return code, msg, err } @@ -205,7 +219,7 @@ func (pconn *persistentConn) fetchFeatures() error { } for _, line := range strings.Split(msg, "\n") { - if line[0] == ' ' { + if len(line) > 0 && line[0] == ' ' { parts := strings.SplitN(strings.TrimSpace(line), " ", 2) if len(parts) == 1 { pconn.features[strings.ToUpper(parts[0])] = "" @@ -228,6 +242,48 @@ func (pconn *persistentConn) hasFeatureWithArg(name, arg string) bool { return found && strings.ToUpper(arg) == val } +func (pconn *persistentConn) setClient() error { + code, msg, err := pconn.sendCommand("CLNT GoFTP") + if err != nil { + return err + } + + if !positiveCompletionReply(code) { + pconn.debug("server doesn't support CLNT: %d-%s", code, msg) + return nil + } + + return nil +} + +func (pconn *persistentConn) setUnicode() error { + code, msg, err := pconn.sendCommand("OPTS UTF8 ON") + if err != nil { + return err + } + + if !positiveCompletionReply(code) { + pconn.debug("server doesn't support UTF8: %d-%s", code, msg) + return nil + } + + return nil +} + +func (pconn *persistentConn) setMLST() error { + code, msg, err := pconn.sendCommand("OPTS MLST type;size;modify;perm;unix.mode;") + if err != nil { + return err + } + + if !positiveCompletionReply(code) { + pconn.debug("server doesn't support UTF8: %d-%s", code, msg) + return nil + } + + return nil +} + func (pconn *persistentConn) logIn() error { if pconn.config.User == "" { return nil