Skip to content

Commit

Permalink
Merge branch 'mattermost:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@offsoc
offsoc authored Oct 4, 2024
2 parents 540b389 + 5a73852 commit 1157316
Show file tree
Hide file tree
Showing 27 changed files with 796 additions and 186 deletions.
7 changes: 0 additions & 7 deletions server/.golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,19 @@ issues:
channels/api4/file_test.go|\
channels/api4/group.go|\
channels/api4/group_local.go|\
channels/api4/group_test.go|\
channels/api4/handlers_test.go|\
channels/api4/import_test.go|\
channels/api4/integration_action.go|\
channels/api4/integration_action_test.go|\
channels/api4/ip_filtering.go|\
channels/api4/ip_filtering_test.go|\
channels/api4/job.go|\
channels/api4/job_test.go|\
channels/api4/ldap.go|\
channels/api4/license.go|\
channels/api4/license_local.go|\
channels/api4/license_test.go|\
channels/api4/oauth.go|\
channels/api4/oauth_test.go|\
channels/api4/outgoing_oauth_connection_test.go|\
channels/api4/permission.go|\
channels/api4/plugin.go|\
channels/api4/plugin_test.go|\
channels/api4/post.go|\
channels/api4/post_test.go|\
channels/api4/preference_test.go|\
channels/api4/reaction.go|\
Expand Down
71 changes: 48 additions & 23 deletions server/channels/api4/group_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func TestGetGroup(t *testing.T) {
require.Error(t, err)
CheckBadRequestStatus(t, response)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.GetGroup(context.Background(), group.Id, "")
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -168,7 +169,8 @@ func TestCreateGroup(t *testing.T) {
require.Error(t, err)
CheckBadRequestStatus(t, response)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.CreateGroup(context.Background(), g)
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -347,7 +349,8 @@ func TestPatchGroup(t *testing.T) {
require.Error(t, err)
CheckBadRequestStatus(t, response)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.PatchGroup(context.Background(), group.Id, gp)
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -440,7 +443,8 @@ func TestLinkGroupTeam(t *testing.T) {
})

t.Run("System manager without invite_user are allowed to link", func(t *testing.T) {
th.SystemManagerClient.Login(context.Background(), th.SystemManagerUser.Email, th.SystemManagerUser.Password)
_, _, err = th.SystemManagerClient.Login(context.Background(), th.SystemManagerUser.Email, th.SystemManagerUser.Password)
require.NoError(t, err)
groupSyncable, response, err = th.SystemManagerClient.LinkGroupSyncable(context.Background(), g.Id, th.BasicTeam.Id, model.GroupSyncableTypeTeam, patch)
require.NoError(t, err)
CheckCreatedStatus(t, response)
Expand Down Expand Up @@ -564,7 +568,8 @@ func TestLinkGroupChannel(t *testing.T) {
})

t.Run("System manager without invite_user are allowed to link", func(t *testing.T) {
th.SystemManagerClient.Login(context.Background(), th.SystemManagerUser.Email, th.SystemManagerUser.Password)
_, _, err = th.SystemManagerClient.Login(context.Background(), th.SystemManagerUser.Email, th.SystemManagerUser.Password)
require.NoError(t, err)
groupSyncable, response, err = th.SystemManagerClient.LinkGroupSyncable(context.Background(), g.Id, th.BasicChannel.Id, model.GroupSyncableTypeChannel, patch)
require.NoError(t, err)
CheckCreatedStatus(t, response)
Expand Down Expand Up @@ -684,7 +689,8 @@ func TestUnlinkGroupTeam(t *testing.T) {
})

t.Run("System manager without invite_user are allowed to link", func(t *testing.T) {
th.SystemManagerClient.Login(context.Background(), th.SystemManagerUser.Email, th.SystemManagerUser.Password)
_, _, err = th.SystemManagerClient.Login(context.Background(), th.SystemManagerUser.Email, th.SystemManagerUser.Password)
require.NoError(t, err)
response, err = th.SystemManagerClient.UnlinkGroupSyncable(context.Background(), g.Id, th.BasicTeam.Id, model.GroupSyncableTypeTeam)
require.NoError(t, err)
CheckOKStatus(t, response)
Expand Down Expand Up @@ -802,7 +808,8 @@ func TestUnlinkGroupChannel(t *testing.T) {
})

t.Run("System manager without invite_user are allowed to link", func(t *testing.T) {
th.SystemManagerClient.Login(context.Background(), th.SystemManagerUser.Email, th.SystemManagerUser.Password)
_, _, err = th.SystemManagerClient.Login(context.Background(), th.SystemManagerUser.Email, th.SystemManagerUser.Password)
require.NoError(t, err)
response, err = th.SystemManagerClient.UnlinkGroupSyncable(context.Background(), g.Id, th.BasicChannel.Id, model.GroupSyncableTypeChannel)
require.NoError(t, err)
CheckOKStatus(t, response)
Expand Down Expand Up @@ -881,7 +888,8 @@ func TestGetGroupTeam(t *testing.T) {
require.Error(t, err)
CheckBadRequestStatus(t, response)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.GetGroupSyncable(context.Background(), g.Id, th.BasicTeam.Id, model.GroupSyncableTypeTeam, "")
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -943,7 +951,8 @@ func TestGetGroupChannel(t *testing.T) {
require.Error(t, err)
CheckBadRequestStatus(t, response)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.GetGroupSyncable(context.Background(), g.Id, th.BasicChannel.Id, model.GroupSyncableTypeChannel, "")
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -996,7 +1005,8 @@ func TestGetGroupTeams(t *testing.T) {

assert.Len(t, groupSyncables, 10)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.GetGroupSyncables(context.Background(), g.Id, model.GroupSyncableTypeTeam, "")
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -1048,7 +1058,8 @@ func TestGetGroupChannels(t *testing.T) {

assert.Len(t, groupSyncables, 10)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.GetGroupSyncables(context.Background(), g.Id, model.GroupSyncableTypeChannel, "")
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -1120,7 +1131,8 @@ func TestPatchGroupTeam(t *testing.T) {
require.Error(t, err)
CheckBadRequestStatus(t, response)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.PatchGroupSyncable(context.Background(), g.Id, th.BasicTeam.Id, model.GroupSyncableTypeTeam, patch)
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -1203,7 +1215,8 @@ func TestPatchGroupChannel(t *testing.T) {
require.Error(t, err)
CheckBadRequestStatus(t, response)

th.SystemAdminClient.Logout(context.Background())
_, err = th.SystemAdminClient.Logout(context.Background())
require.NoError(t, err)
_, response, err = th.SystemAdminClient.PatchGroupSyncable(context.Background(), g.Id, th.BasicChannel.Id, model.GroupSyncableTypeChannel, patch)
require.Error(t, err)
CheckUnauthorizedStatus(t, response)
Expand Down Expand Up @@ -1380,8 +1393,10 @@ func TestGetGroupsAssociatedToChannelsByTeam(t *testing.T) {

t.Run("should return forbidden when the user doesn't have the right permissions", func(t *testing.T) {
require.Nil(t, th.App.RemoveUserFromTeam(th.Context, th.BasicTeam.Id, th.BasicUser.Id, th.SystemAdminUser.Id))
defer th.App.AddUserToTeam(th.Context, th.BasicTeam.Id, th.BasicUser.Id, th.SystemAdminUser.Id)

defer func() {
_, _, appErr := th.App.AddUserToTeam(th.Context, th.BasicTeam.Id, th.BasicUser.Id, th.SystemAdminUser.Id)
require.Nil(t, appErr)
}()
groups, resp, err := th.Client.GetGroupsAssociatedToChannelsByTeam(context.Background(), th.BasicTeam.Id, opts)
require.Error(t, err)
CheckForbiddenStatus(t, resp)
Expand Down Expand Up @@ -1426,7 +1441,8 @@ func TestGetGroupsByTeam(t *testing.T) {
CheckBadRequestStatus(t, response)
})

th.App.Srv().RemoveLicense()
appErr := th.App.Srv().RemoveLicense()
require.Nil(t, appErr)

th.TestForSystemAdminAndLocal(t, func(t *testing.T, client *model.Client4) {
_, _, response, err := client.GetGroupsByTeam(context.Background(), th.BasicTeam.Id, opts)
Expand Down Expand Up @@ -1487,7 +1503,10 @@ func TestGetGroupsByTeam(t *testing.T) {

t.Run("user can't fetch groups if it's not part of the team", func(t *testing.T) {
require.Nil(t, th.App.RemoveUserFromTeam(th.Context, th.BasicTeam.Id, th.BasicUser.Id, th.SystemAdminUser.Id))
defer th.App.AddUserToTeam(th.Context, th.BasicTeam.Id, th.BasicUser.Id, th.SystemAdminUser.Id)
defer func() {
_, _, appErr := th.App.AddUserToTeam(th.Context, th.BasicTeam.Id, th.BasicUser.Id, th.SystemAdminUser.Id)
require.Nil(t, appErr)
}()

groups, _, response, err := th.Client.GetGroupsByTeam(context.Background(), th.BasicTeam.Id, opts)
require.Error(t, err)
Expand Down Expand Up @@ -1580,7 +1599,8 @@ func TestGetGroups(t *testing.T) {
assert.Equal(t, groups[0].Id, group.Id)

// delete group, should still return
th.App.DeleteGroup(group.Id)
_, appErr = th.App.DeleteGroup(group.Id)
require.Nil(t, appErr)
groups, _, err = th.Client.GetGroups(context.Background(), opts)
assert.NoError(t, err)
assert.Len(t, groups, 1)
Expand Down Expand Up @@ -1721,14 +1741,18 @@ func TestGetGroupsByUserId(t *testing.T) {
assert.ElementsMatch(t, []*model.Group{group1, group2}, groups)

// test permissions
th.Client.Logout(context.Background())
th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
_, err = th.Client.Logout(context.Background())
require.NoError(t, err)
_, _, err = th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
require.NoError(t, err)
_, response, err = th.Client.GetGroupsByUserId(context.Background(), user1.Id)
require.Error(t, err)
CheckForbiddenStatus(t, response)

th.Client.Logout(context.Background())
th.Client.Login(context.Background(), user1.Email, user1.Password)
_, err = th.Client.Logout(context.Background())
require.NoError(t, err)
_, _, err = th.Client.Login(context.Background(), user1.Email, user1.Password)
require.NoError(t, err)
groups, _, err = th.Client.GetGroupsByUserId(context.Background(), user1.Id)
require.NoError(t, err)
assert.ElementsMatch(t, []*model.Group{group1, group2}, groups)
Expand Down Expand Up @@ -1823,7 +1847,8 @@ func TestGetGroupStats(t *testing.T) {
th.App.Srv().SetLicense(model.NewTestLicense("ldap"))

t.Run("Requires manage system permission to access group stats", func(t *testing.T) {
th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
_, _, err := th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
require.NoError(t, err)
_, response, err := th.Client.GetGroupStats(context.Background(), group.Id)
require.Error(t, err)
CheckForbiddenStatus(t, response)
Expand Down
4 changes: 3 additions & 1 deletion server/channels/api4/integration_action.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,7 @@ func submitDialog(c *Context, w http.ResponseWriter, r *http.Request) {

b, _ := json.Marshal(resp)

w.Write(b)
if _, err := w.Write(b); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}
8 changes: 6 additions & 2 deletions server/channels/api4/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ func getJobs(c *Context, w http.ResponseWriter, r *http.Request) {
c.Err = model.NewAppError("getJobs", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
return
}
w.Write(js)
if _, err := w.Write(js); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

func getJobsByType(c *Context, w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -241,7 +243,9 @@ func getJobsByType(c *Context, w http.ResponseWriter, r *http.Request) {
return
}

w.Write(js)
if _, err := w.Write(js); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

func cancelJob(c *Context, w http.ResponseWriter, r *http.Request) {
Expand Down
8 changes: 6 additions & 2 deletions server/channels/api4/ldap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ func getLdapGroups(c *Context, w http.ResponseWriter, r *http.Request) {
return
}

w.Write(b)
if _, err := w.Write(b); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

func linkLdapGroup(c *Context, w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -240,7 +242,9 @@ func linkLdapGroup(c *Context, w http.ResponseWriter, r *http.Request) {
auditRec.Success()

w.WriteHeader(status)
w.Write(b)
if _, err := w.Write(b); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

func unlinkLdapGroup(c *Context, w http.ResponseWriter, r *http.Request) {
Expand Down
8 changes: 6 additions & 2 deletions server/channels/api4/oauth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ func getOAuthApps(c *Context, w http.ResponseWriter, r *http.Request) {
return
}

w.Write(js)
if _, err := w.Write(js); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

func getOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -308,5 +310,7 @@ func getAuthorizedOAuthApps(c *Context, w http.ResponseWriter, r *http.Request)
return
}

w.Write(js)
if _, err := w.Write(js); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}
5 changes: 4 additions & 1 deletion server/channels/api4/permission.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net/http"

"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
)

func (api *API) InitPermissions() {
Expand All @@ -25,5 +26,7 @@ func appendAncillaryPermissionsPost(c *Context, w http.ResponseWriter, r *http.R
c.SetJSONEncodingError(err)
return
}
w.Write(b)
if _, err := w.Write(b); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}
12 changes: 9 additions & 3 deletions server/channels/api4/post.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,9 @@ func acknowledgePost(c *Context, w http.ResponseWriter, r *http.Request) {
return
}

w.Write(js)
if _, err := w.Write(js); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

func unacknowledgePost(c *Context, w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -1284,7 +1286,9 @@ func getFileInfosForPost(c *Context, w http.ResponseWriter, r *http.Request) {

w.Header().Set("Cache-Control", "max-age=2592000, private")
w.Header().Set(model.HeaderEtagServer, model.GetEtagForFileInfos(infos))
w.Write(js)
if _, err := w.Write(js); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

func getPostInfo(c *Context, w http.ResponseWriter, r *http.Request) {
Expand All @@ -1305,7 +1309,9 @@ func getPostInfo(c *Context, w http.ResponseWriter, r *http.Request) {
return
}

w.Write(js)
if _, err := w.Write(js); err != nil {
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

func hasPermittedWranglerRole(c *Context, user *model.User, channelMember *model.ChannelMember) bool {
Expand Down
Loading

0 comments on commit 1157316

Please sign in to comment.