MM-55042 Fixes permissions checks (#25253)
* fix permissions check on SessionHasPermissionToTeams and SessionHasPermissionToChannels * add tests, make updates * remove commented code * update to handle session permissions first * Update authorization.go Remove unnecessary check --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
eaa5cce3ce
Коммит
6a021a29f9
@@ -68,31 +68,22 @@ func (a *App) SessionHasPermissionToTeams(c request.CTX, session model.Session,
|
||||
return false
|
||||
}
|
||||
}
|
||||
if session.IsUnrestricted() {
|
||||
|
||||
// Check session permission, if it allows access, no need to check teams.
|
||||
if a.SessionHasPermissionTo(session, permission) {
|
||||
return true
|
||||
}
|
||||
|
||||
// Getting the list of unique roles from all teams.
|
||||
var roles []string
|
||||
uniqueRoles := make(map[string]bool)
|
||||
for _, teamID := range teamIDs {
|
||||
tm := session.GetTeamByTeamId(teamID)
|
||||
if tm != nil {
|
||||
for _, role := range tm.GetRoles() {
|
||||
uniqueRoles[role] = true
|
||||
// If a team member has permission, then no need to check further.
|
||||
if a.RolesGrantPermission(tm.GetRoles(), permission.Id) {
|
||||
continue
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
for role := range uniqueRoles {
|
||||
roles = append(roles, role)
|
||||
}
|
||||
|
||||
if a.RolesGrantPermission(roles, permission.Id) {
|
||||
return true
|
||||
}
|
||||
|
||||
return a.RolesGrantPermission(session.GetUserRoles(), permission.Id)
|
||||
return true
|
||||
}
|
||||
|
||||
func (a *App) SessionHasPermissionToChannel(c request.CTX, session model.Session, channelID string, permission *model.Permission) bool {
|
||||
@@ -139,55 +130,34 @@ func (a *App) SessionHasPermissionToChannels(c request.CTX, session model.Sessio
|
||||
}
|
||||
}
|
||||
|
||||
if session.IsUnrestricted() {
|
||||
// if System Roles (ie. Admin, TeamAdmin) allow permissions
|
||||
// if so, no reason to check team
|
||||
if a.SessionHasPermissionTo(session, permission) {
|
||||
// make sure all channels exist, otherwise return false.
|
||||
for _, channelID := range channelIDs {
|
||||
_, appErr := a.GetChannel(c, channelID)
|
||||
if appErr != nil && appErr.StatusCode == http.StatusNotFound {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
ids, err := a.Srv().Store().Channel().GetAllChannelMembersForUser(session.UserId, true, true)
|
||||
|
||||
var channelRoles []string
|
||||
uniqueRoles := make(map[string]bool)
|
||||
if err == nil {
|
||||
for _, channelID := range channelIDs {
|
||||
for _, channelID := range channelIDs {
|
||||
if err == nil {
|
||||
// If a channel member has permission, then no need to check further.
|
||||
if roles, ok := ids[channelID]; ok {
|
||||
for _, role := range strings.Fields(roles) {
|
||||
uniqueRoles[role] = true
|
||||
channelRoles = strings.Fields(roles)
|
||||
if a.RolesGrantPermission(channelRoles, permission.Id) {
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for role := range uniqueRoles {
|
||||
channelRoles = append(channelRoles, role)
|
||||
}
|
||||
|
||||
if a.RolesGrantPermission(channelRoles, permission.Id) {
|
||||
return true
|
||||
}
|
||||
|
||||
channels, appErr := a.GetChannels(c, channelIDs)
|
||||
if appErr != nil && appErr.StatusCode == http.StatusNotFound {
|
||||
return false
|
||||
}
|
||||
|
||||
// Get TeamIDs from channels
|
||||
uniqueTeamIDs := make(map[string]bool)
|
||||
for _, ch := range channels {
|
||||
if ch.TeamId != "" {
|
||||
uniqueTeamIDs[ch.TeamId] = true
|
||||
}
|
||||
}
|
||||
|
||||
var teamIDs []string
|
||||
for teamID := range uniqueTeamIDs {
|
||||
teamIDs = append(teamIDs, teamID)
|
||||
}
|
||||
|
||||
if appErr == nil && len(teamIDs) > 0 {
|
||||
return a.SessionHasPermissionToTeams(c, session, teamIDs, permission)
|
||||
}
|
||||
|
||||
return a.SessionHasPermissionTo(session, permission)
|
||||
return true
|
||||
}
|
||||
|
||||
func (a *App) SessionHasPermissionToGroup(session model.Session, groupID string, permission *model.Permission) bool {
|
||||
|
||||
Ссылка в новой задаче
Block a user