Skip to content

Exposed Feat, Features and most importantly Cmd fields #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exposed Feat, Features and most importantly Cmd fields #433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions ftp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ type ServerConn struct {
host string

// Server capabilities discovered at runtime
features map[string]string
Features map[string]string
skipEPSV bool
mlstSupported bool
mfmtSupported bool
Expand Down Expand Up @@ -155,7 +155,7 @@ func Dial(addr string, options ...DialOption) (*ServerConn, error) {

c := &ServerConn{
options: do,
features: make(map[string]string),
Features: make(map[string]string),
conn: textproto.NewConn(do.wrapConn(tconn)),
netConn: tconn,
host: remoteAddr.IP.String(),
Expand Down Expand Up @@ -366,17 +366,17 @@ func (c *ServerConn) Login(user, password string) error {
}

// Probe features
err = c.feat()
_, err = c.Feat()
if err != nil {
return err
}
if _, mlstSupported := c.features["MLST"]; mlstSupported && !c.options.disableMLSD {
if _, mlstSupported := c.Features["MLST"]; mlstSupported && !c.options.disableMLSD {
c.mlstSupported = true
}
_, c.usePRET = c.features["PRET"]
_, c.usePRET = c.Features["PRET"]

_, c.mfmtSupported = c.features["MFMT"]
_, c.mdtmSupported = c.features["MDTM"]
_, c.mfmtSupported = c.Features["MFMT"]
_, c.mdtmSupported = c.Features["MDTM"]
c.mdtmCanWrite = c.mdtmSupported && c.options.writingMDTM

// Switch to binary mode
Expand Down Expand Up @@ -411,16 +411,16 @@ func (c *ServerConn) authTLS() error {
// feat issues a FEAT FTP command to list the additional commands supported by
// the remote FTP server.
// FEAT is described in RFC 2389
func (c *ServerConn) feat() error {
func (c *ServerConn) Feat() (map[string]string, error) {
code, message, err := c.cmd(-1, "FEAT")
if err != nil {
return err
return nil, err
}

if code != StatusSystem {
// The server does not support the FEAT command. This is not an
// error: we consider that there is no additional feature.
return nil
return nil, nil
}

lines := strings.Split(message, "\n")
Expand All @@ -439,15 +439,15 @@ func (c *ServerConn) feat() error {
commandDesc = featureElements[1]
}

c.features[command] = commandDesc
c.Features[command] = commandDesc
}

return nil
return c.Features, nil
}

// setUTF8 issues an "OPTS UTF8 ON" command.
func (c *ServerConn) setUTF8() error {
if _, ok := c.features["UTF8"]; !ok {
if _, ok := c.Features["UTF8"]; !ok {
return nil
}

Expand Down Expand Up @@ -610,6 +610,10 @@ func (c *ServerConn) cmd(expected int, format string, args ...interface{}) (int,
return c.conn.ReadResponse(expected)
}

func (c *ServerConn) Cmd(expected int, format string, args ...interface{}) (int, string, error) {
return c.cmd(expected, format, args...)
}

// 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.
func (c *ServerConn) cmdDataConnFrom(offset uint64, format string, args ...interface{}) (net.Conn, error) {
Expand Down