diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-06-04 10:52:25 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-04 10:52:25 -0400 |
| commit | 971149d2b298b3408af7218c868ed0b3edd83c2e (patch) | |
| tree | 86e082c9341ccd98bc6bf5894ce3ee7d14359550 /store | |
| parent | 8d09c58b4dbfd9f9ad651e03263dc109d7680a47 (diff) | |
| download | chat-971149d2b298b3408af7218c868ed0b3edd83c2e.tar.gz chat-971149d2b298b3408af7218c868ed0b3edd83c2e.tar.bz2 chat-971149d2b298b3408af7218c868ed0b3edd83c2e.zip | |
Don't allow users to be added to a channel they are not in the team of (#3246)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_channel_store.go | 8 | ||||
| -rw-r--r-- | store/sql_team_store.go | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 0a8873b57..3636fb62f 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -11,9 +11,9 @@ import ( ) const ( - MISSING_CHANNEL_ERROR = "store.sql_channel.get_by_name.missing.app_error" - MISSING_MEMBER_ERROR = "store.sql_channel.get_member.missing.app_error" - CHANNEL_EXISTS_ERROR = "store.sql_channel.save_channel.exists.app_error" + MISSING_CHANNEL_ERROR = "store.sql_channel.get_by_name.missing.app_error" + MISSING_CHANNEL_MEMBER_ERROR = "store.sql_channel.get_member.missing.app_error" + CHANNEL_EXISTS_ERROR = "store.sql_channel.save_channel.exists.app_error" ) type SqlChannelStore struct { @@ -579,7 +579,7 @@ func (s SqlChannelStore) GetMember(channelId string, userId string) StoreChannel if err := s.GetReplica().SelectOne(&member, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId = :UserId", map[string]interface{}{"ChannelId": channelId, "UserId": userId}); err != nil { if err == sql.ErrNoRows { - result.Err = model.NewLocAppError("SqlChannelStore.GetMember", MISSING_MEMBER_ERROR, nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + result.Err = model.NewLocAppError("SqlChannelStore.GetMember", MISSING_CHANNEL_MEMBER_ERROR, nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) } else { result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) } diff --git a/store/sql_team_store.go b/store/sql_team_store.go index a9f265273..6e1deeb20 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -4,6 +4,8 @@ package store import ( + "database/sql" + "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" ) @@ -420,7 +422,11 @@ func (s SqlTeamStore) GetMember(teamId string, userId string) StoreChannel { var member model.TeamMember err := s.GetReplica().SelectOne(&member, "SELECT * FROM TeamMembers WHERE TeamId = :TeamId AND UserId = :UserId", map[string]interface{}{"TeamId": teamId, "UserId": userId}) if err != nil { - result.Err = model.NewLocAppError("SqlTeamStore.GetMember", "store.sql_team.get_member.app_error", nil, "teamId="+teamId+" userId="+userId+" "+err.Error()) + if err == sql.ErrNoRows { + result.Err = model.NewLocAppError("SqlTeamStore.GetMember", "store.sql_team.get_member.missing.app_error", nil, "teamId="+teamId+" userId="+userId+" "+err.Error()) + } else { + result.Err = model.NewLocAppError("SqlTeamStore.GetMember", "store.sql_team.get_member.app_error", nil, "teamId="+teamId+" userId="+userId+" "+err.Error()) + } } else { result.Data = member } |