summaryrefslogtreecommitdiffstats
path: root/app/command_channel_purpose.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2018-09-12 15:32:05 +0100
committerHarrison Healey <harrisonmhealey@gmail.com>2018-09-12 10:32:05 -0400
commit0a5f792d2d6ceaa6c9bdb3050acbc4050c0c02f5 (patch)
tree37bf6f899abffe926c7c42337a19d67050382e50 /app/command_channel_purpose.go
parentfba0f8e8b2e869654b3970396ed6fb0647e8910f (diff)
downloadchat-0a5f792d2d6ceaa6c9bdb3050acbc4050c0c02f5.tar.gz
chat-0a5f792d2d6ceaa6c9bdb3050acbc4050c0c02f5.tar.bz2
chat-0a5f792d2d6ceaa6c9bdb3050acbc4050c0c02f5.zip
MM-11230: Make permissions checks in commands failsafe. (#9392)
Also add additional unit tests to make sure the permissions tests are completely solid.
Diffstat (limited to 'app/command_channel_purpose.go')
-rw-r--r--app/command_channel_purpose.go48
1 files changed, 34 insertions, 14 deletions
diff --git a/app/command_channel_purpose.go b/app/command_channel_purpose.go
index 547406692..0ddbf1d64 100644
--- a/app/command_channel_purpose.go
+++ b/app/command_channel_purpose.go
@@ -4,8 +4,9 @@
package app
import (
- "github.com/mattermost/mattermost-server/model"
goi18n "github.com/nicksnyder/go-i18n/i18n"
+
+ "github.com/mattermost/mattermost-server/model"
)
type PurposeProvider struct {
@@ -36,23 +37,39 @@ func (me *PurposeProvider) GetCommand(a *App, T goi18n.TranslateFunc) *model.Com
func (me *PurposeProvider) DoCommand(a *App, args *model.CommandArgs, message string) *model.CommandResponse {
channel, err := a.GetChannel(args.ChannelId)
if err != nil {
- return &model.CommandResponse{Text: args.T("api.command_channel_purpose.channel.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
- }
-
- if channel.Type == model.CHANNEL_OPEN && !a.SessionHasPermissionToChannel(args.Session, args.ChannelId, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES) {
- return &model.CommandResponse{Text: args.T("api.command_channel_purpose.permission.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
- }
-
- if channel.Type == model.CHANNEL_PRIVATE && !a.SessionHasPermissionToChannel(args.Session, args.ChannelId, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES) {
- return &model.CommandResponse{Text: args.T("api.command_channel_purpose.permission.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
+ return &model.CommandResponse{
+ Text: args.T("api.command_channel_purpose.channel.app_error"),
+ ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL,
+ }
}
- if channel.Type == model.CHANNEL_GROUP || channel.Type == model.CHANNEL_DIRECT {
- return &model.CommandResponse{Text: args.T("api.command_channel_purpose.direct_group.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
+ switch channel.Type {
+ case model.CHANNEL_OPEN:
+ if !a.SessionHasPermissionToChannel(args.Session, args.ChannelId, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES) {
+ return &model.CommandResponse{
+ Text: args.T("api.command_channel_purpose.permission.app_error"),
+ ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL,
+ }
+ }
+ case model.CHANNEL_PRIVATE:
+ if !a.SessionHasPermissionToChannel(args.Session, args.ChannelId, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES) {
+ return &model.CommandResponse{
+ Text: args.T("api.command_channel_purpose.permission.app_error"),
+ ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL,
+ }
+ }
+ default:
+ return &model.CommandResponse{
+ Text: args.T("api.command_channel_purpose.direct_group.app_error"),
+ ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL,
+ }
}
if len(message) == 0 {
- return &model.CommandResponse{Text: args.T("api.command_channel_purpose.message.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
+ return &model.CommandResponse{
+ Text: args.T("api.command_channel_purpose.message.app_error"),
+ ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL,
+ }
}
patch := &model.ChannelPatch{
@@ -62,7 +79,10 @@ func (me *PurposeProvider) DoCommand(a *App, args *model.CommandArgs, message st
_, err = a.PatchChannel(channel, patch, args.UserId)
if err != nil {
- return &model.CommandResponse{Text: args.T("api.command_channel_purpose.update_channel.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
+ return &model.CommandResponse{
+ Text: args.T("api.command_channel_purpose.update_channel.app_error"),
+ ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL,
+ }
}
return &model.CommandResponse{}