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

cryptfs: fix quota for overwrites if upload fails

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2022-10-10 19:34:15 +02:00
parent 3e44a1dd2d
commit 0e54fa5655
11 changed files with 145 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/common/connection_test.go
View File

@@ -37,10 +37,14 @@ import (
type MockOsFs struct {
vfs.Fs
hasVirtualFolders bool
name string
}
// Name returns the name for the Fs implementation
func (fs *MockOsFs) Name() string {
if fs.name != "" {
return fs.name
}
return "mockOsFs"
}
@@ -57,9 +61,10 @@ func (fs *MockOsFs) Chtimes(name string, atime, mtime time.Time, isUploading boo
return vfs.ErrVfsUnsupported
}
func newMockOsFs(hasVirtualFolders bool, connectionID, rootDir string) vfs.Fs {
func newMockOsFs(hasVirtualFolders bool, connectionID, rootDir, name string) vfs.Fs {
return &MockOsFs{
Fs: vfs.NewOsFs(connectionID, rootDir, ""),
name: name,
hasVirtualFolders: hasVirtualFolders,
}
}
@@ -108,7 +113,7 @@ func TestSetStatMode(t *testing.T) {
}
user.Permissions = make(map[string][]string)
user.Permissions["/"] = []string{dataprovider.PermAny}
fs := newMockOsFs(true, "", user.GetHomeDir())
fs := newMockOsFs(true, "", user.GetHomeDir(), "")
conn := NewBaseConnection("", ProtocolWebDAV, "", "", user)
err := conn.handleChmod(fs, fakePath, fakePath, nil)
assert.NoError(t, err)
@@ -429,7 +434,7 @@ func TestMaxWriteSize(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, int64(90), size)
fs = newMockOsFs(true, fs.ConnectionID(), user.GetHomeDir())
fs = newMockOsFs(true, fs.ConnectionID(), user.GetHomeDir(), "")
size, err = conn.GetMaxWriteSize(quotaResult, true, 100, fs.IsUploadResumeSupported())
assert.EqualError(t, err, ErrOpUnsupported.Error())
assert.Equal(t, int64(0), size)