@@ -56,6 +56,7 @@ func (api *API) InitUser() {
|
||||
api.BaseRoutes.User.Handle("/email/verify/member", api.APISessionRequired(verifyUserEmailWithoutToken)).Methods(http.MethodPost)
|
||||
api.BaseRoutes.User.Handle("/terms_of_service", api.APISessionRequired(saveUserTermsOfService)).Methods(http.MethodPost)
|
||||
api.BaseRoutes.User.Handle("/terms_of_service", api.APISessionRequired(getUserTermsOfService)).Methods(http.MethodGet)
|
||||
api.BaseRoutes.User.Handle("/reset_failed_attempts", api.APISessionRequired(resetPasswordFailedAttempts)).Methods(http.MethodPost)
|
||||
|
||||
api.BaseRoutes.User.Handle("/auth", api.APISessionRequiredTrustRequester(updateUserAuth)).Methods(http.MethodPut)
|
||||
|
||||
@@ -1861,6 +1862,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
"api.user.check_user_login_attempts.too_many.app_error",
|
||||
"app.team.join_user_to_team.max_accounts.app_error",
|
||||
"store.sql_user.save.max_accounts.app_error",
|
||||
"api.user.check_user_login_attempts.too_many_ldap.app_error",
|
||||
}
|
||||
|
||||
maskError := true
|
||||
@@ -3525,3 +3527,46 @@ func getUsersWithInvalidEmails(c *Context, w http.ResponseWriter, r *http.Reques
|
||||
c.Logger.Warn("Error writing response", mlog.Err(err))
|
||||
}
|
||||
}
|
||||
|
||||
func resetPasswordFailedAttempts(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
c.RequireUserId()
|
||||
if c.Err != nil {
|
||||
return
|
||||
}
|
||||
errParams := map[string]any{"userID": c.Params.UserId}
|
||||
|
||||
auditRec := c.MakeAuditRecord("resetPasswordFailedAttempts", audit.Fail)
|
||||
defer c.LogAuditRec(auditRec)
|
||||
|
||||
if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionSysconsoleWriteUserManagementUsers) {
|
||||
c.Err = model.NewAppError("resetPasswordFailedAttempts", "api.user.reset_password_failed_attempts.permissions.app_error", errParams, "", http.StatusForbidden)
|
||||
return
|
||||
}
|
||||
|
||||
user, err := c.App.GetUser(c.Params.UserId)
|
||||
if err != nil {
|
||||
c.Err = err
|
||||
return
|
||||
}
|
||||
auditRec.AddEventPriorState(user)
|
||||
auditRec.AddEventObjectType("user")
|
||||
|
||||
if user.IsSystemAdmin() && !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem) {
|
||||
c.SetPermissionError(model.PermissionManageSystem)
|
||||
return
|
||||
}
|
||||
|
||||
if user.AuthService != model.UserAuthServiceLdap && user.AuthService != "" {
|
||||
c.Err = model.NewAppError("resetPasswordFailedAttempts", "api.user.reset_password_failed_attempts.ldap_and_email_only.app_error", errParams, "", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if err := c.App.ResetPasswordFailedAttempts(c.AppContext, user); err != nil {
|
||||
c.Err = err
|
||||
return
|
||||
}
|
||||
|
||||
auditRec.Success()
|
||||
|
||||
ReturnStatusOK(w)
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/dgryski/dgoogauth"
|
||||
"github.com/golang/mock/gomock"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/mock"
|
||||
"github.com/stretchr/testify/require"
|
||||
@@ -8973,6 +8974,221 @@ func TestRevokeAllSessionsForUser(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func TestResetPasswordFailedAttempts(t *testing.T) {
|
||||
th := SetupEnterprise(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
th.SetupLdapConfig()
|
||||
|
||||
th.App.Srv().SetLicense(model.NewTestLicense("ldap"))
|
||||
|
||||
t.Run("Reset password failed attempts for regular user", func(t *testing.T) {
|
||||
client := th.CreateClient()
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.MaximumLoginAttempts = 10
|
||||
})
|
||||
maxAttempts := th.App.Config().ServiceSettings.MaximumLoginAttempts
|
||||
|
||||
user := th.CreateUser()
|
||||
|
||||
for i := 0; i < *maxAttempts; i++ {
|
||||
_, _, err := client.Login(context.Background(), user.Email, "wrongpassword")
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
user, resp, err := th.SystemAdminClient.GetUser(context.Background(), user.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, *maxAttempts, user.FailedAttempts)
|
||||
|
||||
resp, err = th.SystemAdminClient.ResetFailedAttempts(context.Background(), user.Id)
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
|
||||
user, resp, err = th.SystemAdminClient.GetUser(context.Background(), user.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, int(0), user.FailedAttempts)
|
||||
})
|
||||
|
||||
t.Run("Reset password failed attempts for ldap user", func(t *testing.T) {
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.LdapSettings.MaximumLoginAttempts = 5
|
||||
})
|
||||
|
||||
mockCtrl := gomock.NewController(t)
|
||||
defer mockCtrl.Finish()
|
||||
|
||||
mockLdap := &mocks.LdapInterface{}
|
||||
|
||||
username := GenerateTestUsername()
|
||||
|
||||
ldapUser := &model.User{
|
||||
Email: "foobar+testdomainrestriction@mattermost.org",
|
||||
Username: username,
|
||||
AuthService: "ldap",
|
||||
AuthData: &username,
|
||||
EmailVerified: true,
|
||||
}
|
||||
ldapUser, appErr := th.App.CreateUser(th.Context, ldapUser)
|
||||
require.Nil(t, appErr)
|
||||
|
||||
client := th.CreateClient()
|
||||
mockLdap.Mock.On("GetUser", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("string")).Return(ldapUser, nil).Times(5)
|
||||
|
||||
th.App.Channels().Ldap = mockLdap
|
||||
|
||||
for i := 0; i < 5; i++ {
|
||||
mockedLdapUser := ldapUser
|
||||
mockedLdapUser.FailedAttempts = i
|
||||
mockLdap.Mock.On("DoLogin", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(mockedLdapUser, &model.AppError{Id: "ent.ldap.do_login.invalid_password.app_error"})
|
||||
_, _, err := client.LoginByLdap(context.Background(), *ldapUser.AuthData, "wrongpassword")
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
user, resp, err := th.SystemAdminClient.GetUser(context.Background(), ldapUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, int(5), user.FailedAttempts)
|
||||
|
||||
resp, err = th.SystemAdminClient.ResetFailedAttempts(context.Background(), ldapUser.Id)
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
|
||||
user, resp, err = th.SystemAdminClient.GetUser(context.Background(), ldapUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, int(0), user.FailedAttempts)
|
||||
})
|
||||
|
||||
t.Run("Regular user unable to reset failed attempts", func(t *testing.T) {
|
||||
client := th.CreateClient()
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.MaximumLoginAttempts = 10
|
||||
})
|
||||
maxAttempts := th.App.Config().ServiceSettings.MaximumLoginAttempts
|
||||
|
||||
user := th.CreateUser()
|
||||
|
||||
for i := 0; i < *maxAttempts; i++ {
|
||||
_, _, err := client.Login(context.Background(), user.Email, "wrongpassword")
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
user, resp, err := th.SystemAdminClient.GetUser(context.Background(), user.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, *maxAttempts, user.FailedAttempts)
|
||||
|
||||
resp, err = th.Client.ResetFailedAttempts(context.Background(), user.Id)
|
||||
require.Error(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
user, resp, err = th.SystemAdminClient.GetUser(context.Background(), user.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, *maxAttempts, user.FailedAttempts)
|
||||
})
|
||||
|
||||
t.Run("Reset password failed attempts when user has PermissionSysconsoleWriteUserManagementUsers", func(t *testing.T) {
|
||||
th.AddPermissionToRole(model.PermissionSysconsoleWriteUserManagementUsers.Id, model.SystemUserRoleId)
|
||||
defer th.RemovePermissionFromRole(model.PermissionSysconsoleWriteUserManagementUsers.Id, model.SystemUserRoleId)
|
||||
|
||||
client := th.CreateClient()
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.MaximumLoginAttempts = 10
|
||||
})
|
||||
maxAttempts := th.App.Config().ServiceSettings.MaximumLoginAttempts
|
||||
|
||||
user := th.CreateUser()
|
||||
|
||||
for i := 0; i < *maxAttempts; i++ {
|
||||
_, _, err := client.Login(context.Background(), user.Email, "wrongpassword")
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
fetchedUser, resp, err := th.SystemAdminClient.GetUser(context.Background(), user.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, *maxAttempts, fetchedUser.FailedAttempts)
|
||||
|
||||
resp, err = th.Client.ResetFailedAttempts(context.Background(), user.Id)
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
|
||||
fetchedUser, resp, err = th.SystemAdminClient.GetUser(context.Background(), user.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, int(0), fetchedUser.FailedAttempts)
|
||||
})
|
||||
|
||||
t.Run("Unable to reset password failed attempts for sysadmin when user has PermissionSysconsoleWriteUserManagementUsers", func(t *testing.T) {
|
||||
th.AddPermissionToRole(model.PermissionSysconsoleWriteUserManagementUsers.Id, model.SystemUserRoleId)
|
||||
defer th.RemovePermissionFromRole(model.PermissionSysconsoleWriteUserManagementUsers.Id, model.SystemUserRoleId)
|
||||
|
||||
client := th.CreateClient()
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.MaximumLoginAttempts = 10
|
||||
})
|
||||
maxAttempts := th.App.Config().ServiceSettings.MaximumLoginAttempts
|
||||
|
||||
// create sysadmin user
|
||||
sysadmin := th.CreateUser()
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, sysadmin.Id, model.SystemUserRoleId+" "+model.SystemAdminRoleId, false)
|
||||
require.Nil(t, appErr)
|
||||
|
||||
for i := 0; i < *maxAttempts; i++ {
|
||||
_, _, err := client.Login(context.Background(), sysadmin.Email, "wrongpassword")
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
sysadminUser, resp, err := th.SystemAdminClient.GetUser(context.Background(), sysadmin.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, *maxAttempts, sysadminUser.FailedAttempts)
|
||||
|
||||
resp, err = th.Client.ResetFailedAttempts(context.Background(), sysadminUser.Id)
|
||||
require.Error(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
sysadminUser, resp, err = th.SystemAdminClient.GetUser(context.Background(), sysadminUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, int(10), sysadminUser.FailedAttempts)
|
||||
})
|
||||
|
||||
t.Run("Reset password failed attempts for sysadmin", func(t *testing.T) {
|
||||
client := th.CreateClient()
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.MaximumLoginAttempts = 10
|
||||
})
|
||||
maxAttempts := th.App.Config().ServiceSettings.MaximumLoginAttempts
|
||||
|
||||
sysadmin := th.CreateUser()
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, sysadmin.Id, model.SystemUserRoleId+" "+model.SystemAdminRoleId, false)
|
||||
require.Nil(t, appErr)
|
||||
|
||||
for i := 0; i < *maxAttempts; i++ {
|
||||
_, _, err := client.Login(context.Background(), sysadmin.Email, "wrongpassword")
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
sysadminUser, resp, err := th.SystemAdminClient.GetUser(context.Background(), sysadmin.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, *maxAttempts, sysadminUser.FailedAttempts)
|
||||
|
||||
resp, err = th.SystemAdminClient.ResetFailedAttempts(context.Background(), sysadminUser.Id)
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
|
||||
sysadminUser, resp, err = th.SystemAdminClient.GetUser(context.Background(), sysadminUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
require.Equal(t, int(0), sysadminUser.FailedAttempts)
|
||||
})
|
||||
}
|
||||
func TestSearchUsersWithMfaEnforced(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
Ссылка в новой задаче
Block a user