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

fix a potential race condition for pre-login and ext auth

Browse Source 
hooks

doing something like this:

err = provider.updateUser(u)
...
return provider.userExists(username)

could be racy if another update happen before

provider.userExists(username)

also pass a pointer to updateUser so if the user is modified inside
"validateUser" we can just return the modified user without do a new
query
This commit is contained in:
Nicola Murino
2021-01-05 09:50:22 +01:00
parent 72b2c83392
commit daac90c4e1
26 changed files with 167 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/connection_test.go
View File

@@ -1031,7 +1031,7 @@ func TestHasSpace(t *testing.T) {
user.VirtualFolders[0].QuotaFiles = 0
user.VirtualFolders[0].QuotaSize = 0
err = dataprovider.AddUser(user)
err = dataprovider.AddUser(&user)
assert.NoError(t, err)
user, err = dataprovider.UserExists(user.Username)
assert.NoError(t, err)
@@ -1041,7 +1041,7 @@ func TestHasSpace(t *testing.T) {
user.VirtualFolders[0].QuotaFiles = 10
user.VirtualFolders[0].QuotaSize = 1048576
err = dataprovider.UpdateUser(user)
err = dataprovider.UpdateUser(&user)
assert.NoError(t, err)
c.User = user
quotaResult = c.HasSpace(true, "/vdir/file1")
@@ -1057,10 +1057,10 @@ func TestHasSpace(t *testing.T) {
quotaResult = c.HasSpace(true, "/vdir/file1")
assert.False(t, quotaResult.HasSpace)
err = dataprovider.DeleteUser(user)
err = dataprovider.DeleteUser(&user)
assert.NoError(t, err)
err = dataprovider.DeleteFolder(folder)
err = dataprovider.DeleteFolder(&folder)
assert.NoError(t, err)
}
@@ -1091,7 +1091,7 @@ func TestUpdateQuotaMoveVFolders(t *testing.T) {
QuotaFiles: -1,
QuotaSize: -1,
})
err := dataprovider.AddUser(user)
err := dataprovider.AddUser(&user)
assert.NoError(t, err)
user, err = dataprovider.UserExists(user.Username)
assert.NoError(t, err)
@@ -1148,11 +1148,11 @@ func TestUpdateQuotaMoveVFolders(t *testing.T) {
assert.Equal(t, 1, user.UsedQuotaFiles)
assert.Equal(t, int64(100), user.UsedQuotaSize)
err = dataprovider.DeleteUser(user)
err = dataprovider.DeleteUser(&user)
assert.NoError(t, err)
err = dataprovider.DeleteFolder(folder1)
err = dataprovider.DeleteFolder(&folder1)
assert.NoError(t, err)
err = dataprovider.DeleteFolder(folder2)
err = dataprovider.DeleteFolder(&folder2)
assert.NoError(t, err)
}