Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 23:00:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

scp: minor improvements

Browse Source 
document that we don't support wildcard expansion.

I should refactor scp code ...
This commit is contained in:
Nicola Murino
2021-01-05 22:32:30 +01:00
parent aa40b04576
commit a8a17a223a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sftpd/scp.go
View File

@@ -541,7 +541,7 @@ func (c *scpCommand) readConfirmationMessage() error {
break
}
if n > 0 {
msg.WriteString(string(readed))
msg.Write(readed)
}
}
c.connection.Log(logger.LevelInfo, "scp error message received: %v is error: %v", msg.String(), isError)
@@ -567,7 +567,7 @@ func (c *scpCommand) readProtocolMessage() (string, error) {
if n == 1 && readed[0] == newLine[0] {
break
}
command.WriteString(string(readed))
command.Write(readed)
}
}
if err != nil {
@@ -605,7 +605,6 @@ func (c *scpCommand) sendProtocolMessage(message string) error {
}
// get the next upload protocol message ignoring T command if any
// we use our own user setting for permissions
func (c *scpCommand) getNextUploadProtocolMessage() (string, error) {
var command string
var err error
@@ -631,6 +630,8 @@ func (c *scpCommand) createDir(dirPath string) error {
var isDir bool
isDir, err = vfs.IsDirectory(c.connection.Fs, dirPath)
if err == nil && isDir {
// if this is a virtual dir the resolved path will exist, we don't need a specific check
// TODO: remember to check if it's okay when we'll add virtual folders support to cloud backends
c.connection.Log(logger.LevelDebug, "directory %#v already exists", dirPath)
return nil
}
@@ -675,7 +676,7 @@ func (c *scpCommand) parseUploadMessage(command string) (int64, string, error) {
return size, name, err
}
} else {
err = fmt.Errorf("Error splitting upload message: %#v", command)
err = fmt.Errorf("unable to split upload message: %#v", command)
c.connection.Log(logger.LevelWarn, "error: %v", err)
c.sendErrorMessage(err)
return size, name, err