diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/email.go | 1 | ||||
-rw-r--r-- | app/team.go | 5 | ||||
-rw-r--r-- | app/team_test.go | 67 |
3 files changed, 0 insertions, 73 deletions
diff --git a/app/email.go b/app/email.go index 8ee3e79e2..7676dfe13 100644 --- a/app/email.go +++ b/app/email.go @@ -276,7 +276,6 @@ func (a *App) SendInviteEmails(team *model.Team, senderName string, invites []st props["display_name"] = team.DisplayName props["name"] = team.Name props["time"] = fmt.Sprintf("%v", model.GetMillis()) - props["invite_id"] = team.InviteId data := model.MapToJson(props) hash := utils.HashSha256(fmt.Sprintf("%v:%v", data, a.Config().EmailSettings.InviteSalt)) bodyPage.Props["Link"] = fmt.Sprintf("%s/signup_user_complete/?d=%s&h=%s", siteURL, url.QueryEscape(data), url.QueryEscape(hash)) diff --git a/app/team.go b/app/team.go index a7b32af33..de71ed796 100644 --- a/app/team.go +++ b/app/team.go @@ -238,11 +238,6 @@ func (a *App) AddUserToTeamByHash(userId string, hash string, data string) (*mod team = result.Data.(*model.Team) } - // verify that the team's invite id hasn't been changed since the invite was sent - if team.InviteId != props["invite_id"] { - return nil, model.NewAppError("JoinUserToTeamByHash", "api.user.create_user.signup_link_mismatched_invite_id.app_error", nil, "", http.StatusBadRequest) - } - var user *model.User if result := <-uchan; result.Err != nil { return nil, result.Err diff --git a/app/team_test.go b/app/team_test.go index cdfec12da..95f4b83d6 100644 --- a/app/team_test.go +++ b/app/team_test.go @@ -7,15 +7,7 @@ import ( "strings" "testing" - "fmt" - - "sync/atomic" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/utils" - "github.com/stretchr/testify/assert" ) func TestCreateTeam(t *testing.T) { @@ -402,65 +394,6 @@ func TestSanitizeTeams(t *testing.T) { }) } -func TestAddUserToTeamByHashMismatchedInviteId(t *testing.T) { - mockStore := &storetest.Store{} - defer mockStore.AssertExpectations(t) - - teamId := model.NewId() - userId := model.NewId() - inviteSalt := model.NewId() - - inviteId := model.NewId() - teamInviteId := model.NewId() - - // generate a fake email invite - stolen from SendInviteEmails() in email.go - props := make(map[string]string) - props["email"] = model.NewId() + "@mattermost.com" - props["id"] = teamId - props["display_name"] = model.NewId() - props["name"] = model.NewId() - props["time"] = fmt.Sprintf("%v", model.GetMillis()) - props["invite_id"] = inviteId - data := model.MapToJson(props) - hash := utils.HashSha256(fmt.Sprintf("%v:%v", data, inviteSalt)) - - // when the server tries to validate the invite, it will pull the user from our mock store - // this can return nil, because we'll fail before we get to trying to use it - mockStore.UserStore.On("Get", userId).Return( - storetest.NewStoreChannel(store.StoreResult{ - Data: nil, - Err: nil, - }), - ) - - // the server will also pull the team. the one we return has a different invite id than the one in the email invite we made above - mockStore.TeamStore.On("Get", teamId).Return( - storetest.NewStoreChannel(store.StoreResult{ - Data: &model.Team{ - InviteId: teamInviteId, - }, - Err: nil, - }), - ) - - app := App{ - Srv: &Server{ - Store: mockStore, - }, - config: atomic.Value{}, - } - app.config.Store(&model.Config{ - EmailSettings: model.EmailSettings{ - InviteSalt: inviteSalt, - }, - }) - - // this should fail because the invite ids are mismatched - team, err := app.AddUserToTeamByHash(userId, hash, data) - assert.Nil(t, team) - assert.Equal(t, "api.user.create_user.signup_link_mismatched_invite_id.app_error", err.Id) -} - func TestJoinUserToTeam(t *testing.T) { th := Setup().InitBasic() defer th.TearDown() |