beenull/sftpgo-mirror
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2024-11-22 07:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sftpd: fix the max upload file size check for overwrites

Browse source 
improved test case too
This commit is contained in:
Nicola Murino 2020-10-25 08:52:31 +01:00
parent 5ff8f75917
commit 975a2f3632
No known key found for this signature in database
GPG key ID: 2F1FB59433D5A8CB
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ftpd/ftpd_test.go
View file

@ -824,6 +824,11 @@ func TestUploadMaxSize(t *testing.T) {
assert.Error(t, err) assert.Error(t, err)
err = ftpUploadFile(testFilePath, testFileName, testFileSize, client, 0) err = ftpUploadFile(testFilePath, testFileName, testFileSize, client, 0)
assert.NoError(t, err) assert.NoError(t, err)
// now test overwrite an existing file with a size bigger than the allowed one
err = createTestFile(filepath.Join(user.GetHomeDir(), testFileName1), testFileSize1)
assert.NoError(t, err)
err = ftpUploadFile(testFilePath1, testFileName1, testFileSize1, client, 0)
assert.Error(t, err)
err = client.Quit() err = client.Quit()
assert.NoError(t, err) assert.NoError(t, err)
} }

3
sftpd/handler.go
View file

@ -391,9 +391,6 @@ func (c *Connection) handleSFTPUploadToExistingFile(pflags sftp.FileOpenFlags, r
} else { } else {
initialSize = fileSize initialSize = fileSize
} }
if maxWriteSize > 0 && isTruncate {
maxWriteSize += fileSize
}
} }
vfs.SetPathPermissions(c.Fs, filePath, c.User.GetUID(), c.User.GetGID()) vfs.SetPathPermissions(c.Fs, filePath, c.User.GetUID(), c.User.GetGID())

5
sftpd/sftpd_test.go
View file

@ -2482,6 +2482,11 @@ func TestUploadMaxSize(t *testing.T) {
assert.Error(t, err) assert.Error(t, err)
err = sftpUploadFile(testFilePath, testFileName, testFileSize, client) err = sftpUploadFile(testFilePath, testFileName, testFileSize, client)
assert.NoError(t, err) assert.NoError(t, err)
// now test overwrite an existing file with a size bigger than the allowed one
err = createTestFile(filepath.Join(user.GetHomeDir(), testFileName1), testFileSize1)
assert.NoError(t, err)
err = sftpUploadFile(testFilePath1, testFileName1, testFileSize1, client)
assert.Error(t, err)
} }
err = os.Remove(testFilePath) err = os.Remove(testFilePath)
assert.NoError(t, err) assert.NoError(t, err)

5
webdavd/webdavd_test.go
View file

@ -701,6 +701,11 @@ func TestUploadMaxSize(t *testing.T) {
assert.Error(t, err) assert.Error(t, err)
err = uploadFile(testFilePath, testFileName, testFileSize, client) err = uploadFile(testFilePath, testFileName, testFileSize, client)
assert.NoError(t, err) assert.NoError(t, err)
// now test overwrite an existing file with a size bigger than the allowed one
err = createTestFile(filepath.Join(user.GetHomeDir(), testFileName1), testFileSize1)
assert.NoError(t, err)
err = uploadFile(testFilePath1, testFileName1, testFileSize1, client)
assert.Error(t, err)
err = os.Remove(testFilePath) err = os.Remove(testFilePath)
assert.NoError(t, err) assert.NoError(t, err)