MM-10264: Adds system scheme to permissions import/export. (#8924)
* MM-10264: Adds system scheme to permissions import/export. * MM-10264: Switches to more likely unique name. * MM-10264: Changed collision prevention string. * MM-10264: Rolls back created schemes in all error cases. * MM-10264: Test fix for more rollback cases.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
927b11f6e2
Коммит
566539bc67
@@ -14,6 +14,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const permissionsExportBatchSize = 100
|
const permissionsExportBatchSize = 100
|
||||||
|
const systemSchemeName = "00000000-0000-0000-0000-000000000000" // Prevents collisions with user-created schemes.
|
||||||
|
|
||||||
func (a *App) ResetPermissionsSystem() *model.AppError {
|
func (a *App) ResetPermissionsSystem() *model.AppError {
|
||||||
// Reset all Teams to not have a scheme.
|
// Reset all Teams to not have a scheme.
|
||||||
@@ -101,6 +102,31 @@ func (a *App) ExportPermissions(w io.Writer) error {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
defaultRoleNames := []string{}
|
||||||
|
for _, dr := range model.MakeDefaultRoles() {
|
||||||
|
defaultRoleNames = append(defaultRoleNames, dr.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
roles, appErr := a.GetRolesByNames(defaultRoleNames)
|
||||||
|
if appErr != nil {
|
||||||
|
return errors.New(appErr.Message)
|
||||||
|
}
|
||||||
|
|
||||||
|
schemeExport, err := json.Marshal(&model.SchemeConveyor{
|
||||||
|
Name: systemSchemeName,
|
||||||
|
Roles: roles,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
schemeExport = append(schemeExport, []byte("\n")...)
|
||||||
|
|
||||||
|
_, err = w.Write(schemeExport)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,13 +139,33 @@ func (a *App) ImportPermissions(jsonl io.Reader) error {
|
|||||||
var schemeConveyor *model.SchemeConveyor
|
var schemeConveyor *model.SchemeConveyor
|
||||||
err := json.Unmarshal(scanner.Bytes(), &schemeConveyor)
|
err := json.Unmarshal(scanner.Bytes(), &schemeConveyor)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
rollback(a, createdSchemeIDs)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if schemeConveyor.Name == systemSchemeName {
|
||||||
|
for _, roleIn := range schemeConveyor.Roles {
|
||||||
|
dbRole, err := a.GetRoleByName(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.
|
// Create the new Scheme. The new Roles are created automatically.
|
||||||
var appErr *model.AppError
|
var appErr *model.AppError
|
||||||
schemeCreated, appErr := a.CreateScheme(schemeConveyor.Scheme())
|
schemeCreated, appErr := a.CreateScheme(schemeConveyor.Scheme())
|
||||||
if appErr != nil {
|
if appErr != nil {
|
||||||
|
rollback(a, createdSchemeIDs)
|
||||||
return errors.New(appErr.Message)
|
return errors.New(appErr.Message)
|
||||||
}
|
}
|
||||||
createdSchemeIDs = append(createdSchemeIDs, schemeCreated.Id)
|
createdSchemeIDs = append(createdSchemeIDs, schemeCreated.Id)
|
||||||
@@ -139,21 +185,26 @@ func (a *App) ImportPermissions(jsonl io.Reader) error {
|
|||||||
err = updateRole(a, schemeConveyor, roleNameTuple[0], roleNameTuple[1])
|
err = updateRole(a, schemeConveyor, roleNameTuple[0], roleNameTuple[1])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Delete the new Schemes. The new Roles are deleted automatically.
|
// Delete the new Schemes. The new Roles are deleted automatically.
|
||||||
for _, schemeID := range createdSchemeIDs {
|
rollback(a, createdSchemeIDs)
|
||||||
a.DeleteScheme(schemeID)
|
|
||||||
}
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := scanner.Err(); err != nil {
|
if err := scanner.Err(); err != nil {
|
||||||
|
rollback(a, createdSchemeIDs)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
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 {
|
func updateRole(a *App, sc *model.SchemeConveyor, roleCreatedName, defaultRoleName string) error {
|
||||||
var err *model.AppError
|
var err *model.AppError
|
||||||
|
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ func TestImportPermissions_idempotentScheme(t *testing.T) {
|
|||||||
if appErr != nil {
|
if appErr != nil {
|
||||||
panic(appErr)
|
panic(appErr)
|
||||||
}
|
}
|
||||||
expected = len(results) + 1
|
expected = len(results)
|
||||||
|
|
||||||
err := th.App.ImportPermissions(r)
|
err := th.App.ImportPermissions(r)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user