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: fix quota update after file overwrite

Browse Source 
added a test case too
This commit is contained in:
Nicola Murino
2019-09-02 23:12:41 +02:00
parent 4a1b67454e
commit dc5eeb54fd
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sftpd/scp.go
View File

@@ -188,8 +188,7 @@ func (c *scpCommand) getUploadFileData(sizeToRead int64, transfer *Transfer) err
return c.sendConfirmationMessage()
}
func (c *scpCommand) handleUploadFile(requestPath, filePath string, sizeToRead int64) error {
logger.Debug(logSenderSCP, "upload to new file: %v", filePath)
func (c *scpCommand) handleUploadFile(requestPath, filePath string, sizeToRead int64, isNewFile bool) error {
if !c.connection.hasSpace(true) {
err := fmt.Errorf("denying file write due to space limit")
logger.Warn(logSenderSCP, "error uploading file: %v, err: %v", filePath, err)
@@ -225,7 +224,7 @@ func (c *scpCommand) handleUploadFile(requestPath, filePath string, sizeToRead i
connectionID: c.connection.ID,
transferType: transferUpload,
lastActivity: time.Now(),
isNewFile: true,
isNewFile: isNewFile,
protocol: c.connection.protocol,
}
addTransfer(&transfer)
@@ -256,7 +255,7 @@ func (c *scpCommand) handleUpload(uploadFilePath string, sizeToRead int64) error
}
stat, statErr := os.Stat(p)
if os.IsNotExist(statErr) {
return c.handleUploadFile(p, filePath, sizeToRead)
return c.handleUploadFile(p, filePath, sizeToRead, true)
}
if statErr != nil {
@@ -284,7 +283,7 @@ func (c *scpCommand) handleUpload(uploadFilePath string, sizeToRead int64) error
dataprovider.UpdateUserQuota(dataProvider, c.connection.User, 0, -stat.Size(), false)
return c.handleUploadFile(p, filePath, sizeToRead)
return c.handleUploadFile(p, filePath, sizeToRead, false)
}
func (c *scpCommand) sendDownloadProtocolMessages(dirPath string, stat os.FileInfo) error {