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

actions: don't execute actions on errors

Browse Source 
detect upload/download errors and don't execute actions if a transfer
error happen.

To detect SFTP errors this patch is needed:

https://github.com/pkg/sftp/pull/307
This commit is contained in:
Nicola Murino
2019-09-07 23:10:20 +02:00
parent 2a7e56ed29
commit bc5779e26f
6 changed files with 132 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sftpd/scp.go
View File

@@ -151,6 +151,7 @@ func (c *scpCommand) handleCreateDir(dirPath string) error {
func (c *scpCommand) getUploadFileData(sizeToRead int64, transfer *Transfer) error {
err := c.sendConfirmationMessage()
if err != nil {
transfer.TransferError(err)
transfer.Close()
return err
}
@@ -162,6 +163,7 @@ func (c *scpCommand) getUploadFileData(sizeToRead int64, transfer *Transfer) err
n, err := c.channel.Read(buf)
if err != nil {
c.sendErrorMessage(err.Error())
transfer.TransferError(err)
transfer.Close()
return err
}
@@ -177,6 +179,7 @@ func (c *scpCommand) getUploadFileData(sizeToRead int64, transfer *Transfer) err
}
err = c.readConfirmationMessage()
if err != nil {
transfer.TransferError(err)
transfer.Close()
return err
}
@@ -226,6 +229,8 @@ func (c *scpCommand) handleUploadFile(requestPath, filePath string, sizeToRead i
lastActivity: time.Now(),
isNewFile: isNewFile,
protocol: c.connection.protocol,
transferError: nil,
isFinished: false,
}
addTransfer(&transfer)
@@ -468,6 +473,8 @@ func (c *scpCommand) handleDownload(filePath string) error {
lastActivity: time.Now(),
isNewFile: false,
protocol: c.connection.protocol,
transferError: nil,
isFinished: false,
}
addTransfer(&transfer)
@@ -477,6 +484,7 @@ func (c *scpCommand) handleDownload(filePath string) error {
if err == nil {
err = transfer.Close()
} else {
transfer.TransferError(err)
transfer.Close()
}
return err