mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
50fa5f0f3e
* MM-27275: Log the correct error when GetUser fails in MFA Authentication We were not logging the error returned from GetUser which makes debugging things very hard in case of logout issues like https://mattermost.atlassian.net/browse/MM-27270. We fix this by appending the error inside model.AppError and setting a proper error string which says exactly what has happened. * Update web/context.go Co-authored-by: Doug Lauder <wiggin77@warpmail.net> Co-authored-by: Doug Lauder <wiggin77@warpmail.net> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
69 lines
2.1 KiB
Go
69 lines
2.1 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package web
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/mattermost/mattermost-server/v5/model"
|
|
"github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock"
|
|
"github.com/mattermost/mattermost-server/v5/store/storetest/mocks"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestRequireHookId(t *testing.T) {
|
|
c := &Context{}
|
|
t.Run("WhenHookIdIsValid", func(t *testing.T) {
|
|
c.Params = &Params{HookId: "abcdefghijklmnopqrstuvwxyz"}
|
|
c.RequireHookId()
|
|
|
|
require.Nil(t, c.Err, "Hook Id is Valid. Should not have set error in context")
|
|
})
|
|
|
|
t.Run("WhenHookIdIsInvalid", func(t *testing.T) {
|
|
c.Params = &Params{HookId: "abc"}
|
|
c.RequireHookId()
|
|
|
|
require.Error(t, c.Err, "Should have set Error in context")
|
|
require.Equal(t, http.StatusBadRequest, c.Err.StatusCode, "Should have set status as 400")
|
|
})
|
|
}
|
|
|
|
func TestMfaRequired(t *testing.T) {
|
|
th := SetupWithStoreMock(t)
|
|
defer th.TearDown()
|
|
|
|
mockStore := th.App.Srv().Store.(*mocks.Store)
|
|
mockUserStore := mocks.UserStore{}
|
|
mockUserStore.On("Count", mock.Anything).Return(int64(10), nil)
|
|
mockUserStore.On("Get", "userid").Return(nil, model.NewAppError("Userstore.Get", "storeerror", nil, "store error", http.StatusInternalServerError))
|
|
mockPostStore := mocks.PostStore{}
|
|
mockPostStore.On("GetMaxPostSize").Return(65535, nil)
|
|
mockSystemStore := mocks.SystemStore{}
|
|
mockSystemStore.On("GetByName", "InstallationDate").Return(&model.System{Name: "InstallationDate", Value: "10"}, nil)
|
|
|
|
mockStore.On("User").Return(&mockUserStore)
|
|
mockStore.On("Post").Return(&mockPostStore)
|
|
mockStore.On("System").Return(&mockSystemStore)
|
|
|
|
th.App.Srv().SetLicense(model.NewTestLicense("mfa"))
|
|
|
|
th.App.SetSession(&model.Session{Id: "abc", UserId: "userid"})
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
|
*cfg.ServiceSettings.EnableMultifactorAuthentication = true
|
|
*cfg.ServiceSettings.EnforceMultifactorAuthentication = true
|
|
})
|
|
|
|
c := &Context{
|
|
App: th.App,
|
|
}
|
|
|
|
c.MfaRequired()
|
|
|
|
assert.Equal(t, c.Err.Id, "api.context.get_user.app_error")
|
|
}
|