Fixed errcheck issues in server/channels/app/permissions.go (#29064)
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
6e738f489f
Коммит
e8ef26196c
@@ -4,10 +4,8 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
@@ -152,108 +150,3 @@ func (a *App) ExportPermissions(w io.Writer) error {
|
||||
_, err = w.Write(schemeExport)
|
||||
return err
|
||||
}
|
||||
|
||||
func (a *App) ImportPermissions(jsonl io.Reader) error {
|
||||
createdSchemeIDs := []string{}
|
||||
|
||||
scanner := bufio.NewScanner(jsonl)
|
||||
|
||||
for scanner.Scan() {
|
||||
var schemeConveyor *model.SchemeConveyor
|
||||
err := json.Unmarshal(scanner.Bytes(), &schemeConveyor)
|
||||
if err != nil {
|
||||
rollback(a, createdSchemeIDs)
|
||||
return err
|
||||
}
|
||||
|
||||
if schemeConveyor.Name == systemSchemeName {
|
||||
for _, roleIn := range schemeConveyor.Roles {
|
||||
dbRole, err := a.GetRoleByName(context.Background(), roleIn.Name)
|
||||
if err != nil {
|
||||
rollback(a, createdSchemeIDs)
|
||||
return errors.New(err.Message)
|
||||
}
|
||||
_, err = a.PatchRole(dbRole, &model.RolePatch{
|
||||
Permissions: &roleIn.Permissions,
|
||||
})
|
||||
if err != nil {
|
||||
rollback(a, createdSchemeIDs)
|
||||
return err
|
||||
}
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
// Create the new Scheme. The new Roles are created automatically.
|
||||
var appErr *model.AppError
|
||||
schemeCreated, appErr := a.CreateScheme(schemeConveyor.Scheme())
|
||||
if appErr != nil {
|
||||
rollback(a, createdSchemeIDs)
|
||||
return errors.New(appErr.Message)
|
||||
}
|
||||
createdSchemeIDs = append(createdSchemeIDs, schemeCreated.Id)
|
||||
|
||||
schemeIn := schemeConveyor.Scheme()
|
||||
roleNameTuples := [][]string{
|
||||
{schemeCreated.DefaultTeamAdminRole, schemeIn.DefaultTeamAdminRole},
|
||||
{schemeCreated.DefaultTeamUserRole, schemeIn.DefaultTeamUserRole},
|
||||
{schemeCreated.DefaultTeamGuestRole, schemeIn.DefaultTeamGuestRole},
|
||||
{schemeCreated.DefaultChannelAdminRole, schemeIn.DefaultChannelAdminRole},
|
||||
{schemeCreated.DefaultChannelUserRole, schemeIn.DefaultChannelUserRole},
|
||||
{schemeCreated.DefaultChannelGuestRole, schemeIn.DefaultChannelGuestRole},
|
||||
}
|
||||
for _, roleNameTuple := range roleNameTuples {
|
||||
if roleNameTuple[0] == "" || roleNameTuple[1] == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
err = updateRole(a, schemeConveyor, roleNameTuple[0], roleNameTuple[1])
|
||||
if err != nil {
|
||||
// Delete the new Schemes. The new Roles are deleted automatically.
|
||||
rollback(a, createdSchemeIDs)
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if err := scanner.Err(); err != nil {
|
||||
rollback(a, createdSchemeIDs)
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func rollback(a *App, createdSchemeIDs []string) {
|
||||
for _, schemeID := range createdSchemeIDs {
|
||||
a.DeleteScheme(schemeID)
|
||||
}
|
||||
}
|
||||
|
||||
func updateRole(a *App, sc *model.SchemeConveyor, roleCreatedName, defaultRoleName string) error {
|
||||
var err *model.AppError
|
||||
|
||||
roleCreated, err := a.GetRoleByName(context.Background(), roleCreatedName)
|
||||
if err != nil {
|
||||
return errors.New(err.Message)
|
||||
}
|
||||
|
||||
var roleIn *model.Role
|
||||
for _, role := range sc.Roles {
|
||||
if role.Name == defaultRoleName {
|
||||
roleIn = role
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
roleCreated.DisplayName = roleIn.DisplayName
|
||||
roleCreated.Description = roleIn.Description
|
||||
roleCreated.Permissions = roleIn.Permissions
|
||||
|
||||
_, err = a.UpdateRole(roleCreated)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to update role: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user