diff --git a/internal/common/connection.go b/internal/common/connection.go index e7f9c9a8..b569be68 100644 --- a/internal/common/connection.go +++ b/internal/common/connection.go @@ -449,10 +449,7 @@ func (c *BaseConnection) RemoveFile(fs vfs.Fs, fsPath, virtualPath string, info if updateQuota && info.Mode()&os.ModeSymlink == 0 { vfolder, err := c.User.GetVirtualFolderForPath(path.Dir(virtualPath)) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, -1, -size, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, -1, -size, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(&vfolder, &c.User, -1, -size, false) } else { dataprovider.UpdateUserQuota(&c.User, -1, -size, false) //nolint:errcheck } @@ -1121,10 +1118,7 @@ func (c *BaseConnection) truncateFile(fs vfs.Fs, fsPath, virtualPath string, siz sizeDiff := initialSize - size vfolder, err := c.User.GetVirtualFolderForPath(path.Dir(virtualPath)) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, 0, -sizeDiff, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, 0, -sizeDiff, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(&vfolder, &c.User, 0, -sizeDiff, false) } else { dataprovider.UpdateUserQuota(&c.User, 0, -sizeDiff, false) //nolint:errcheck } @@ -1518,61 +1512,40 @@ func (c *BaseConnection) updateQuotaMoveBetweenVFolders(sourceFolder, dstFolder if sourceFolder.Name == dstFolder.Name { // both files are inside the same virtual folder if initialSize != -1 { - dataprovider.UpdateVirtualFolderQuota(&dstFolder.BaseVirtualFolder, -numFiles, -initialSize, false) //nolint:errcheck - if dstFolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, -numFiles, -initialSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(dstFolder, &c.User, -numFiles, -initialSize, false) } return } // files are inside different virtual folders - dataprovider.UpdateVirtualFolderQuota(&sourceFolder.BaseVirtualFolder, -numFiles, -filesSize, false) //nolint:errcheck - if sourceFolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, -numFiles, -filesSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(sourceFolder, &c.User, -numFiles, -filesSize, false) if initialSize == -1 { - dataprovider.UpdateVirtualFolderQuota(&dstFolder.BaseVirtualFolder, numFiles, filesSize, false) //nolint:errcheck - if dstFolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, numFiles, filesSize, false) //nolint:errcheck - } - } else { - // we cannot have a directory here, initialSize != -1 only for files - dataprovider.UpdateVirtualFolderQuota(&dstFolder.BaseVirtualFolder, 0, filesSize-initialSize, false) //nolint:errcheck - if dstFolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, 0, filesSize-initialSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(dstFolder, &c.User, numFiles, filesSize, false) + return } + // we cannot have a directory here, initialSize != -1 only for files + dataprovider.UpdateUserFolderQuota(dstFolder, &c.User, 0, filesSize-initialSize, false) } func (c *BaseConnection) updateQuotaMoveFromVFolder(sourceFolder *vfs.VirtualFolder, initialSize, filesSize int64, numFiles int) { // move between a virtual folder and the user home dir - dataprovider.UpdateVirtualFolderQuota(&sourceFolder.BaseVirtualFolder, -numFiles, -filesSize, false) //nolint:errcheck - if sourceFolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, -numFiles, -filesSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(sourceFolder, &c.User, -numFiles, -filesSize, false) if initialSize == -1 { dataprovider.UpdateUserQuota(&c.User, numFiles, filesSize, false) //nolint:errcheck - } else { - // we cannot have a directory here, initialSize != -1 only for files - dataprovider.UpdateUserQuota(&c.User, 0, filesSize-initialSize, false) //nolint:errcheck + return } + // we cannot have a directory here, initialSize != -1 only for files + dataprovider.UpdateUserQuota(&c.User, 0, filesSize-initialSize, false) //nolint:errcheck } func (c *BaseConnection) updateQuotaMoveToVFolder(dstFolder *vfs.VirtualFolder, initialSize, filesSize int64, numFiles int) { // move between the user home dir and a virtual folder dataprovider.UpdateUserQuota(&c.User, -numFiles, -filesSize, false) //nolint:errcheck if initialSize == -1 { - dataprovider.UpdateVirtualFolderQuota(&dstFolder.BaseVirtualFolder, numFiles, filesSize, false) //nolint:errcheck - if dstFolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, numFiles, filesSize, false) //nolint:errcheck - } - } else { - // we cannot have a directory here, initialSize != -1 only for files - dataprovider.UpdateVirtualFolderQuota(&dstFolder.BaseVirtualFolder, 0, filesSize-initialSize, false) //nolint:errcheck - if dstFolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, 0, filesSize-initialSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(dstFolder, &c.User, numFiles, filesSize, false) + return } + // we cannot have a directory here, initialSize != -1 only for files + dataprovider.UpdateUserFolderQuota(dstFolder, &c.User, 0, filesSize-initialSize, false) } func (c *BaseConnection) updateQuotaAfterRename(fs vfs.Fs, virtualSourcePath, virtualTargetPath, targetPath string, diff --git a/internal/common/eventmanager.go b/internal/common/eventmanager.go index 3d9140e0..4bc33635 100644 --- a/internal/common/eventmanager.go +++ b/internal/common/eventmanager.go @@ -908,10 +908,7 @@ func updateUserQuotaAfterFileWrite(conn *BaseConnection, virtualPath string, num dataprovider.UpdateUserQuota(&conn.User, numFiles, fileSize, false) //nolint:errcheck return } - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, numFiles, fileSize, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&conn.User, numFiles, fileSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(&vfolder, &conn.User, numFiles, fileSize, false) } func checkWriterPermsAndQuota(conn *BaseConnection, virtualPath string, numFiles int, expectedSize, truncatedSize int64) error { diff --git a/internal/common/transfer.go b/internal/common/transfer.go index f4e78e30..ae1ed432 100644 --- a/internal/common/transfer.go +++ b/internal/common/transfer.go @@ -521,11 +521,8 @@ func (t *BaseTransfer) updateQuota(numFiles int, fileSize int64) bool { if t.transferType == TransferUpload && (numFiles != 0 || sizeDiff != 0) { vfolder, err := t.Connection.User.GetVirtualFolderForPath(path.Dir(t.requestPath)) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, numFiles, //nolint:errcheck + dataprovider.UpdateUserFolderQuota(&vfolder, &t.Connection.User, numFiles, sizeDiff, false) - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&t.Connection.User, numFiles, sizeDiff, false) //nolint:errcheck - } } else { dataprovider.UpdateUserQuota(&t.Connection.User, numFiles, sizeDiff, false) //nolint:errcheck } diff --git a/internal/dataprovider/dataprovider.go b/internal/dataprovider/dataprovider.go index 677ee0bb..aad45c7e 100644 --- a/internal/dataprovider/dataprovider.go +++ b/internal/dataprovider/dataprovider.go @@ -1515,6 +1515,14 @@ func UpdateUserQuota(user *User, filesAdd int, sizeAdd int64, reset bool) error return nil } +// UpdateUserFolderQuota updates the quota for the given user and virtual folder. +func UpdateUserFolderQuota(folder *vfs.VirtualFolder, user *User, filesAdd int, sizeAdd int64, reset bool) { + UpdateVirtualFolderQuota(&folder.BaseVirtualFolder, filesAdd, sizeAdd, reset) //nolint:errcheck + if folder.IsIncludedInUserQuota() { + UpdateUserQuota(user, filesAdd, sizeAdd, reset) //nolint:errcheck + } +} + // UpdateVirtualFolderQuota updates the quota for the given virtual folder adding filesAdd and sizeAdd. // If reset is true filesAdd and sizeAdd indicates the total files and the total size instead of the difference. func UpdateVirtualFolderQuota(vfolder *vfs.BaseVirtualFolder, filesAdd int, sizeAdd int64, reset bool) error { diff --git a/internal/ftpd/handler.go b/internal/ftpd/handler.go index 036c3977..5a997f91 100644 --- a/internal/ftpd/handler.go +++ b/internal/ftpd/handler.go @@ -493,10 +493,7 @@ func (c *Connection) handleFTPUploadToExistingFile(fs vfs.Fs, flags int, resolve if vfs.HasTruncateSupport(fs) { vfolder, err := c.User.GetVirtualFolderForPath(path.Dir(requestPath)) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, 0, -fileSize, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(&vfolder, &c.User, 0, -fileSize, false) } else { dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck } diff --git a/internal/httpd/handler.go b/internal/httpd/handler.go index d417cc4a..4fb70fde 100644 --- a/internal/httpd/handler.go +++ b/internal/httpd/handler.go @@ -213,10 +213,7 @@ func (c *Connection) handleUploadFile(fs vfs.Fs, resolvedPath, filePath, request if vfs.HasTruncateSupport(fs) { vfolder, err := c.User.GetVirtualFolderForPath(path.Dir(requestPath)) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, 0, -fileSize, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(&vfolder, &c.User, 0, -fileSize, false) } else { dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck } diff --git a/internal/sftpd/handler.go b/internal/sftpd/handler.go index c551da1b..12adc753 100644 --- a/internal/sftpd/handler.go +++ b/internal/sftpd/handler.go @@ -560,13 +560,10 @@ func (c *Connection) getStatVFSFromQuotaResult(fs vfs.Fs, name string, quotaResu func (c *Connection) updateQuotaAfterTruncate(requestPath string, fileSize int64) { vfolder, err := c.User.GetVirtualFolderForPath(path.Dir(requestPath)) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, 0, -fileSize, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck - } - } else { - dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck + dataprovider.UpdateUserFolderQuota(&vfolder, &c.User, 0, -fileSize, false) + return } + dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck } func getOSOpenFlags(requestFlags sftp.FileOpenFlags) (flags int) { diff --git a/internal/sftpd/scp.go b/internal/sftpd/scp.go index be4079ed..6b97af08 100644 --- a/internal/sftpd/scp.go +++ b/internal/sftpd/scp.go @@ -258,10 +258,7 @@ func (c *scpCommand) handleUploadFile(fs vfs.Fs, resolvedPath, filePath string, if vfs.HasTruncateSupport(fs) { vfolder, err := c.connection.User.GetVirtualFolderForPath(path.Dir(requestPath)) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, 0, -fileSize, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.connection.User, 0, -fileSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(&vfolder, &c.connection.User, 0, -fileSize, false) } else { dataprovider.UpdateUserQuota(&c.connection.User, 0, -fileSize, false) //nolint:errcheck } diff --git a/internal/sftpd/ssh_cmd.go b/internal/sftpd/ssh_cmd.go index 8a342e99..7d4db85c 100644 --- a/internal/sftpd/ssh_cmd.go +++ b/internal/sftpd/ssh_cmd.go @@ -192,13 +192,10 @@ func (c *sshCommand) handleSFTPGoRemove() error { func (c *sshCommand) updateQuota(sshDestPath string, filesNum int, filesSize int64) { vfolder, err := c.connection.User.GetVirtualFolderForPath(sshDestPath) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, filesNum, filesSize, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.connection.User, filesNum, filesSize, false) //nolint:errcheck - } - } else { - dataprovider.UpdateUserQuota(&c.connection.User, filesNum, filesSize, false) //nolint:errcheck + dataprovider.UpdateUserFolderQuota(&vfolder, &c.connection.User, filesNum, filesSize, false) + return } + dataprovider.UpdateUserQuota(&c.connection.User, filesNum, filesSize, false) //nolint:errcheck } func (c *sshCommand) handleHashCommands() error { diff --git a/internal/webdavd/handler.go b/internal/webdavd/handler.go index 674b5b72..e31d1961 100644 --- a/internal/webdavd/handler.go +++ b/internal/webdavd/handler.go @@ -272,10 +272,7 @@ func (c *Connection) handleUploadToExistingFile(fs vfs.Fs, resolvedPath, filePat if vfs.HasTruncateSupport(fs) { vfolder, err := c.User.GetVirtualFolderForPath(path.Dir(requestPath)) if err == nil { - dataprovider.UpdateVirtualFolderQuota(&vfolder.BaseVirtualFolder, 0, -fileSize, false) //nolint:errcheck - if vfolder.IsIncludedInUserQuota() { - dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck - } + dataprovider.UpdateUserFolderQuota(&vfolder, &c.User, 0, -fileSize, false) } else { dataprovider.UpdateUserQuota(&c.User, 0, -fileSize, false) //nolint:errcheck }