IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate "User.UpdateMfaActive" to Sync by default (#11566)

Browse Source
This commit is contained in:
Micah Thompson
2019-07-10 14:55:17 -04:00
committed by Joram Wilander
parent e9b82bc1ce
commit 903085feb8
6 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api4/user_test.go
View File

@@ -2114,8 +2114,8 @@ func TestUserLoginMFAFlow(t *testing.T) {
assert.Nil(t, err)
// Fake user has MFA enabled
if result := <-th.Server.Store.User().UpdateMfaActive(th.BasicUser.Id, true); result.Err != nil {
t.Fatal(result.Err)
if err = th.Server.Store.User().UpdateMfaActive(th.BasicUser.Id, true); err != nil {
t.Fatal(err)
}
if err = th.Server.Store.User().UpdateMfaSecret(th.BasicUser.Id, secret.Secret); err != nil {
@@ -2146,8 +2146,8 @@ func TestUserLoginMFAFlow(t *testing.T) {
assert.Nil(t, err)
// Fake user has MFA enabled
if result := <-th.Server.Store.User().UpdateMfaActive(th.BasicUser.Id, true); result.Err != nil {
t.Fatal(result.Err)
if err = th.Server.Store.User().UpdateMfaActive(th.BasicUser.Id, true); err != nil {
t.Fatal(err)
}
if err = th.Server.Store.User().UpdateMfaSecret(th.BasicUser.Id, secret.Secret); err != nil {
@@ -4352,8 +4352,8 @@ func TestLoginLockout(t *testing.T) {
CheckErrorMessage(t, resp, "api.user.check_user_login_attempts.too_many.app_error")
// Fake user has MFA enabled
if result := <-th.Server.Store.User().UpdateMfaActive(th.BasicUser2.Id, true); result.Err != nil {
t.Fatal(result.Err)
if err := th.Server.Store.User().UpdateMfaActive(th.BasicUser2.Id, true); err != nil {
t.Fatal(err)
}
_, resp = th.Client.LoginWithMFA(th.BasicUser2.Email, th.BasicUser2.Password, "000000")
CheckErrorMessage(t, resp, "api.user.check_user_mfa.bad_code.app_error")
@@ -4367,8 +4367,8 @@ func TestLoginLockout(t *testing.T) {
CheckErrorMessage(t, resp, "api.user.check_user_login_attempts.too_many.app_error")
// Fake user has MFA disabled
if result := <-th.Server.Store.User().UpdateMfaActive(th.BasicUser2.Id, false); result.Err != nil {
t.Fatal(result.Err)
if err := th.Server.Store.User().UpdateMfaActive(th.BasicUser2.Id, false); err != nil {
t.Fatal(err)
}
//Check if lock is active

9
services/mfa/mfa.go
View File

@@ -99,8 +99,8 @@ func (m *Mfa) Activate(user *model.User, token string) *model.AppError {
return model.NewAppError("Activate", "mfa.activate.bad_token.app_error", nil, "", http.StatusUnauthorized)
}
if result := <-m.Store.User().UpdateMfaActive(user.Id, true); result.Err != nil {
return model.NewAppError("Activate", "mfa.activate.save_active.app_error", nil, result.Err.Error(), http.StatusInternalServerError)
if err = m.Store.User().UpdateMfaActive(user.Id, true); err != nil {
return model.NewAppError("Activate", "mfa.activate.save_active.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return nil
@@ -111,15 +111,14 @@ func (m *Mfa) Deactivate(userId string) *model.AppError {
return err
}
achan := m.Store.User().UpdateMfaActive(userId, false)
schan := make(chan *model.AppError, 1)
go func() {
schan <- m.Store.User().UpdateMfaSecret(userId, "")
close(schan)
}()
if result := <-achan; result.Err != nil {
return model.NewAppError("Deactivate", "mfa.deactivate.save_active.app_error", nil, result.Err.Error(), http.StatusInternalServerError)
if err := m.Store.User().UpdateMfaActive(userId, false); err != nil {
return model.NewAppError("Deactivate", "mfa.deactivate.save_active.app_error", nil, err.Error(), http.StatusInternalServerError)
}
if err := <-schan; err != nil {

16
store/sqlstore/user_store.go
View File

@@ -303,16 +303,14 @@ func (us SqlUserStore) UpdateMfaSecret(userId, secret string) *model.AppError {
return nil
}
func (us SqlUserStore) UpdateMfaActive(userId string, active bool) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
updateAt := model.GetMillis()
func (us SqlUserStore) UpdateMfaActive(userId string, active bool) *model.AppError {
updateAt := model.GetMillis()
if _, err := us.GetMaster().Exec("UPDATE Users SET MfaActive = :Active, UpdateAt = :UpdateAt WHERE Id = :UserId", map[string]interface{}{"Active": active, "UpdateAt": updateAt, "UserId": userId}); err != nil {
result.Err = model.NewAppError("SqlUserStore.UpdateMfaActive", "store.sql_user.update_mfa_active.app_error", nil, "id="+userId+", "+err.Error(), http.StatusInternalServerError)
} else {
result.Data = userId
}
})
if _, err := us.GetMaster().Exec("UPDATE Users SET MfaActive = :Active, UpdateAt = :UpdateAt WHERE Id = :UserId", map[string]interface{}{"Active": active, "UpdateAt": updateAt, "UserId": userId}); err != nil {
return model.NewAppError("SqlUserStore.UpdateMfaActive", "store.sql_user.update_mfa_active.app_error", nil, "id="+userId+", "+err.Error(), http.StatusInternalServerError)
}
return nil
}
func (us SqlUserStore) Get(id string) (*model.User, *model.AppError) {

2
store/store.go
View File

@@ -257,7 +257,7 @@ type UserStore interface {
UpdateUpdateAt(userId string) (int64, *model.AppError)
UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, *model.AppError)
UpdateMfaSecret(userId, secret string) *model.AppError
UpdateMfaActive(userId string, active bool) StoreChannel
UpdateMfaActive(userId string, active bool) *model.AppError
Get(id string) (*model.User, *model.AppError)
GetAll() ([]*model.User, *model.AppError)
ClearCaches()

8
store/storetest/mocks/UserStore.go
View File

@@ -1127,15 +1127,15 @@ func (_m *UserStore) UpdateLastPictureUpdate(userId string) *model.AppError {
}
// UpdateMfaActive provides a mock function with given fields: userId, active
func (_m *UserStore) UpdateMfaActive(userId string, active bool) store.StoreChannel {
func (_m *UserStore) UpdateMfaActive(userId string, active bool) *model.AppError {
ret := _m.Called(userId, active)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string, bool) store.StoreChannel); ok {
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, bool) *model.AppError); ok {
r0 = rf(userId, active)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.AppError)
}
}

6
store/storetest/user_store.go
View File

@@ -1987,16 +1987,16 @@ func testUserStoreUpdateMfaActive(t *testing.T, ss store.Store) {
time.Sleep(100 * time.Millisecond)
if err = (<-ss.User().UpdateMfaActive(u1.Id, true)).Err; err != nil {
if err = ss.User().UpdateMfaActive(u1.Id, true); err != nil {
t.Fatal(err)
}
if err = (<-ss.User().UpdateMfaActive(u1.Id, false)).Err; err != nil {
if err = ss.User().UpdateMfaActive(u1.Id, false); err != nil {
t.Fatal(err)
}
// should pass, no update will occur though
if err = (<-ss.User().UpdateMfaActive("junk", true)).Err; err != nil {
if err = ss.User().UpdateMfaActive("junk", true); err != nil {
t.Fatal(err)
}
}