mirror of
https://github.com/drakkan/sftpgo.git
synced 2025-12-08 07:10:56 +03:00
add role to events
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
@@ -958,7 +958,7 @@ func TestBasicUsersCache(t *testing.T) {
|
||||
}
|
||||
u.Permissions = make(map[string][]string)
|
||||
u.Permissions["/"] = []string{dataprovider.PermAny}
|
||||
err := dataprovider.AddUser(&u, "", "")
|
||||
err := dataprovider.AddUser(&u, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
user, err := dataprovider.UserExists(u.Username, "")
|
||||
assert.NoError(t, err)
|
||||
@@ -1030,7 +1030,7 @@ func TestBasicUsersCache(t *testing.T) {
|
||||
assert.False(t, cachedUser.IsExpired())
|
||||
}
|
||||
// cache is not invalidated after a user modification if the fs does not change
|
||||
err = dataprovider.UpdateUser(&user, "", "")
|
||||
err = dataprovider.UpdateUser(&user, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
_, ok = dataprovider.GetCachedWebDAVUser(username)
|
||||
assert.True(t, ok)
|
||||
@@ -1043,7 +1043,7 @@ func TestBasicUsersCache(t *testing.T) {
|
||||
VirtualPath: "/vdir",
|
||||
})
|
||||
|
||||
err = dataprovider.UpdateUser(&user, "", "")
|
||||
err = dataprovider.UpdateUser(&user, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
_, ok = dataprovider.GetCachedWebDAVUser(username)
|
||||
assert.False(t, ok)
|
||||
@@ -1060,7 +1060,7 @@ func TestBasicUsersCache(t *testing.T) {
|
||||
_, ok = dataprovider.GetCachedWebDAVUser(username)
|
||||
assert.False(t, ok)
|
||||
|
||||
err = dataprovider.DeleteFolder(folderName, "", "")
|
||||
err = dataprovider.DeleteFolder(folderName, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
|
||||
err = os.RemoveAll(u.GetHomeDir())
|
||||
@@ -1089,7 +1089,7 @@ func TestCachedUserWithFolders(t *testing.T) {
|
||||
},
|
||||
VirtualPath: "/vpath",
|
||||
})
|
||||
err := dataprovider.AddUser(&u, "", "")
|
||||
err := dataprovider.AddUser(&u, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
user, err := dataprovider.UserExists(u.Username, "")
|
||||
assert.NoError(t, err)
|
||||
@@ -1142,7 +1142,7 @@ func TestCachedUserWithFolders(t *testing.T) {
|
||||
folder, err := dataprovider.GetFolderByName(folderName)
|
||||
assert.NoError(t, err)
|
||||
// updating a used folder should invalidate the cache only if the fs changed
|
||||
err = dataprovider.UpdateFolder(&folder, folder.Users, folder.Groups, "", "")
|
||||
err = dataprovider.UpdateFolder(&folder, folder.Users, folder.Groups, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
|
||||
_, isCached, _, loginMethod, err = server.authenticate(req, ipAddr)
|
||||
@@ -1155,7 +1155,7 @@ func TestCachedUserWithFolders(t *testing.T) {
|
||||
}
|
||||
// changing the folder path should invalidate the cache
|
||||
folder.MappedPath = filepath.Join(os.TempDir(), "anotherpath")
|
||||
err = dataprovider.UpdateFolder(&folder, folder.Users, folder.Groups, "", "")
|
||||
err = dataprovider.UpdateFolder(&folder, folder.Users, folder.Groups, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
_, isCached, _, loginMethod, err = server.authenticate(req, ipAddr)
|
||||
assert.NoError(t, err)
|
||||
@@ -1166,7 +1166,7 @@ func TestCachedUserWithFolders(t *testing.T) {
|
||||
assert.False(t, cachedUser.IsExpired())
|
||||
}
|
||||
|
||||
err = dataprovider.DeleteFolder(folderName, "", "")
|
||||
err = dataprovider.DeleteFolder(folderName, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
// removing a used folder should invalidate the cache
|
||||
_, isCached, _, loginMethod, err = server.authenticate(req, ipAddr)
|
||||
@@ -1204,25 +1204,25 @@ func TestUsersCacheSizeAndExpiration(t *testing.T) {
|
||||
u.Password = password + "1"
|
||||
u.Permissions = make(map[string][]string)
|
||||
u.Permissions["/"] = []string{dataprovider.PermAny}
|
||||
err := dataprovider.AddUser(&u, "", "")
|
||||
err := dataprovider.AddUser(&u, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
user1, err := dataprovider.UserExists(u.Username, "")
|
||||
assert.NoError(t, err)
|
||||
u.Username = username + "2"
|
||||
u.Password = password + "2"
|
||||
err = dataprovider.AddUser(&u, "", "")
|
||||
err = dataprovider.AddUser(&u, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
user2, err := dataprovider.UserExists(u.Username, "")
|
||||
assert.NoError(t, err)
|
||||
u.Username = username + "3"
|
||||
u.Password = password + "3"
|
||||
err = dataprovider.AddUser(&u, "", "")
|
||||
err = dataprovider.AddUser(&u, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
user3, err := dataprovider.UserExists(u.Username, "")
|
||||
assert.NoError(t, err)
|
||||
u.Username = username + "4"
|
||||
u.Password = password + "4"
|
||||
err = dataprovider.AddUser(&u, "", "")
|
||||
err = dataprovider.AddUser(&u, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
user4, err := dataprovider.UserExists(u.Username, "")
|
||||
assert.NoError(t, err)
|
||||
@@ -1355,7 +1355,7 @@ func TestUsersCacheSizeAndExpiration(t *testing.T) {
|
||||
|
||||
// now remove user1 after an update
|
||||
user1.HomeDir += "_mod"
|
||||
err = dataprovider.UpdateUser(&user1, "", "")
|
||||
err = dataprovider.UpdateUser(&user1, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
_, ok = dataprovider.GetCachedWebDAVUser(user1.Username)
|
||||
assert.False(t, ok)
|
||||
@@ -1414,7 +1414,7 @@ func TestUserCacheIsolation(t *testing.T) {
|
||||
}
|
||||
u.Permissions = make(map[string][]string)
|
||||
u.Permissions["/"] = []string{dataprovider.PermAny}
|
||||
err := dataprovider.AddUser(&u, "", "")
|
||||
err := dataprovider.AddUser(&u, "", "", "")
|
||||
assert.NoError(t, err)
|
||||
user, err := dataprovider.UserExists(u.Username, "")
|
||||
assert.NoError(t, err)
|
||||
|
||||
Reference in New Issue
Block a user