mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

MM-9618: Don't change default role permissions for policy. (#8303)

Просмотр исходного кода
Этот коммит содержится в:
George Goldberg
2018-02-19 10:16:45 +00:00
коммит произвёл GitHub
родитель 642d78173a
Коммит 0e718a632a
5 изменённых файлов: 47 добавлений и 47 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
api/channel_test.go
Просмотреть файл

@@ -1108,8 +1108,8 @@ func TestDeleteChannel(t *testing.T) {
th.RestoreDefaultRolePermissions(defaultRolePermissions) th.RestoreDefaultRolePermissions(defaultRolePermissions)
}() }()
th.AddPermissionToRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.CHANNEL_USER_ROLE_ID) th.AddPermissionToRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.TEAM_USER_ROLE_ID)
th.AddPermissionToRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.CHANNEL_USER_ROLE_ID) th.AddPermissionToRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.TEAM_USER_ROLE_ID)
th.LoginSystemAdmin() th.LoginSystemAdmin()
th.LinkUserToTeam(th.BasicUser, team) th.LinkUserToTeam(th.BasicUser, team)
@@ -1131,8 +1131,8 @@ func TestDeleteChannel(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
th.RemovePermissionFromRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.CHANNEL_USER_ROLE_ID) th.RemovePermissionFromRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.TEAM_USER_ROLE_ID)
th.RemovePermissionFromRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.CHANNEL_USER_ROLE_ID) th.RemovePermissionFromRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.TEAM_USER_ROLE_ID)
th.AddPermissionToRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.CHANNEL_ADMIN_ROLE_ID) th.AddPermissionToRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.CHANNEL_ADMIN_ROLE_ID)
th.AddPermissionToRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.CHANNEL_ADMIN_ROLE_ID) th.AddPermissionToRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.CHANNEL_ADMIN_ROLE_ID)

8
api4/channel_test.go
Просмотреть файл

@@ -829,8 +829,8 @@ func TestDeleteChannel(t *testing.T) {
th.RestoreDefaultRolePermissions(defaultRolePermissions) th.RestoreDefaultRolePermissions(defaultRolePermissions)
}() }()
th.AddPermissionToRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.CHANNEL_USER_ROLE_ID) th.AddPermissionToRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.TEAM_USER_ROLE_ID)
th.AddPermissionToRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.CHANNEL_USER_ROLE_ID) th.AddPermissionToRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.TEAM_USER_ROLE_ID)
Client = th.Client Client = th.Client
team = th.BasicTeam team = th.BasicTeam
@@ -852,8 +852,8 @@ func TestDeleteChannel(t *testing.T) {
CheckNoError(t, resp) CheckNoError(t, resp)
// Restrict permissions to Channel Admins // Restrict permissions to Channel Admins
th.RemovePermissionFromRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.CHANNEL_USER_ROLE_ID) th.RemovePermissionFromRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.TEAM_USER_ROLE_ID)
th.RemovePermissionFromRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.CHANNEL_USER_ROLE_ID) th.RemovePermissionFromRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.TEAM_USER_ROLE_ID)
th.AddPermissionToRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.CHANNEL_ADMIN_ROLE_ID) th.AddPermissionToRole(model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.CHANNEL_ADMIN_ROLE_ID)
th.AddPermissionToRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.CHANNEL_ADMIN_ROLE_ID) th.AddPermissionToRole(model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.CHANNEL_ADMIN_ROLE_ID)

12
app/app_test.go
Просмотреть файл

@@ -111,10 +111,6 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) {
model.PERMISSION_GET_PUBLIC_LINK.Id, model.PERMISSION_GET_PUBLIC_LINK.Id,
model.PERMISSION_CREATE_POST.Id, model.PERMISSION_CREATE_POST.Id,
model.PERMISSION_USE_SLASH_COMMANDS.Id, model.PERMISSION_USE_SLASH_COMMANDS.Id,
model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id,
model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id,
model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id,
model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id,
model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id,
model.PERMISSION_DELETE_POST.Id, model.PERMISSION_DELETE_POST.Id,
model.PERMISSION_EDIT_POST.Id, model.PERMISSION_EDIT_POST.Id,
@@ -128,7 +124,11 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) {
model.PERMISSION_READ_PUBLIC_CHANNEL.Id, model.PERMISSION_READ_PUBLIC_CHANNEL.Id,
model.PERMISSION_VIEW_TEAM.Id, model.PERMISSION_VIEW_TEAM.Id,
model.PERMISSION_CREATE_PUBLIC_CHANNEL.Id, model.PERMISSION_CREATE_PUBLIC_CHANNEL.Id,
model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id,
model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id,
model.PERMISSION_CREATE_PRIVATE_CHANNEL.Id, model.PERMISSION_CREATE_PRIVATE_CHANNEL.Id,
model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id,
model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id,
model.PERMISSION_INVITE_USER.Id, model.PERMISSION_INVITE_USER.Id,
model.PERMISSION_ADD_USER_TO_TEAM.Id, model.PERMISSION_ADD_USER_TO_TEAM.Id,
}, },
@@ -270,8 +270,6 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) {
model.PERMISSION_GET_PUBLIC_LINK.Id, model.PERMISSION_GET_PUBLIC_LINK.Id,
model.PERMISSION_CREATE_POST.Id, model.PERMISSION_CREATE_POST.Id,
model.PERMISSION_USE_SLASH_COMMANDS.Id, model.PERMISSION_USE_SLASH_COMMANDS.Id,
model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id,
model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id,
model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id,
model.PERMISSION_DELETE_POST.Id, model.PERMISSION_DELETE_POST.Id,
model.PERMISSION_EDIT_POST.Id, model.PERMISSION_EDIT_POST.Id,
@@ -285,7 +283,9 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) {
model.PERMISSION_READ_PUBLIC_CHANNEL.Id, model.PERMISSION_READ_PUBLIC_CHANNEL.Id,
model.PERMISSION_VIEW_TEAM.Id, model.PERMISSION_VIEW_TEAM.Id,
model.PERMISSION_CREATE_PUBLIC_CHANNEL.Id, model.PERMISSION_CREATE_PUBLIC_CHANNEL.Id,
model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id,
model.PERMISSION_CREATE_PRIVATE_CHANNEL.Id, model.PERMISSION_CREATE_PRIVATE_CHANNEL.Id,
model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id,
model.PERMISSION_INVITE_USER.Id, model.PERMISSION_INVITE_USER.Id,
model.PERMISSION_ADD_USER_TO_TEAM.Id, model.PERMISSION_ADD_USER_TO_TEAM.Id,
}, },

32
utils/authorization.go
Просмотреть файл

@@ -31,8 +31,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi
if isLicensed { if isLicensed {
switch *cfg.TeamSettings.RestrictPublicChannelManagement { switch *cfg.TeamSettings.RestrictPublicChannelManagement {
case model.PERMISSIONS_ALL: case model.PERMISSIONS_ALL:
roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( roles[model.TEAM_USER_ROLE_ID].Permissions = append(
roles[model.CHANNEL_USER_ROLE_ID].Permissions, roles[model.TEAM_USER_ROLE_ID].Permissions,
model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id,
) )
case model.PERMISSIONS_CHANNEL_ADMIN: case model.PERMISSIONS_CHANNEL_ADMIN:
@@ -51,8 +51,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi
) )
} }
} else { } else {
roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( roles[model.TEAM_USER_ROLE_ID].Permissions = append(
roles[model.CHANNEL_USER_ROLE_ID].Permissions, roles[model.TEAM_USER_ROLE_ID].Permissions,
model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id,
) )
} }
@@ -60,8 +60,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi
if isLicensed { if isLicensed {
switch *cfg.TeamSettings.RestrictPublicChannelDeletion { switch *cfg.TeamSettings.RestrictPublicChannelDeletion {
case model.PERMISSIONS_ALL: case model.PERMISSIONS_ALL:
roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( roles[model.TEAM_USER_ROLE_ID].Permissions = append(
roles[model.CHANNEL_USER_ROLE_ID].Permissions, roles[model.TEAM_USER_ROLE_ID].Permissions,
model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id,
) )
case model.PERMISSIONS_CHANNEL_ADMIN: case model.PERMISSIONS_CHANNEL_ADMIN:
@@ -80,8 +80,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi
) )
} }
} else { } else {
roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( roles[model.TEAM_USER_ROLE_ID].Permissions = append(
roles[model.CHANNEL_USER_ROLE_ID].Permissions, roles[model.TEAM_USER_ROLE_ID].Permissions,
model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id,
) )
} }
@@ -109,8 +109,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi
if isLicensed { if isLicensed {
switch *cfg.TeamSettings.RestrictPrivateChannelManagement { switch *cfg.TeamSettings.RestrictPrivateChannelManagement {
case model.PERMISSIONS_ALL: case model.PERMISSIONS_ALL:
roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( roles[model.TEAM_USER_ROLE_ID].Permissions = append(
roles[model.CHANNEL_USER_ROLE_ID].Permissions, roles[model.TEAM_USER_ROLE_ID].Permissions,
model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id,
) )
case model.PERMISSIONS_CHANNEL_ADMIN: case model.PERMISSIONS_CHANNEL_ADMIN:
@@ -129,8 +129,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi
) )
} }
} else { } else {
roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( roles[model.TEAM_USER_ROLE_ID].Permissions = append(
roles[model.CHANNEL_USER_ROLE_ID].Permissions, roles[model.TEAM_USER_ROLE_ID].Permissions,
model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id,
) )
} }
@@ -138,8 +138,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi
if isLicensed { if isLicensed {
switch *cfg.TeamSettings.RestrictPrivateChannelDeletion { switch *cfg.TeamSettings.RestrictPrivateChannelDeletion {
case model.PERMISSIONS_ALL: case model.PERMISSIONS_ALL:
roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( roles[model.TEAM_USER_ROLE_ID].Permissions = append(
roles[model.CHANNEL_USER_ROLE_ID].Permissions, roles[model.TEAM_USER_ROLE_ID].Permissions,
model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id,
) )
case model.PERMISSIONS_CHANNEL_ADMIN: case model.PERMISSIONS_CHANNEL_ADMIN:
@@ -158,8 +158,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi
) )
} }
} else { } else {
roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( roles[model.TEAM_USER_ROLE_ID].Permissions = append(
roles[model.CHANNEL_USER_ROLE_ID].Permissions, roles[model.TEAM_USER_ROLE_ID].Permissions,
model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id,
) )
} }

34
utils/policies-roles-mapping.json
Просмотреть файл

@@ -101,14 +101,14 @@
"restrictPublicChannelManagement": { "restrictPublicChannelManagement": {
"all": [ "all": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "manage_public_channel_properties", "permission": "manage_public_channel_properties",
"shouldHave": true "shouldHave": true
} }
], ],
"channel_admin": [ "channel_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "manage_public_channel_properties", "permission": "manage_public_channel_properties",
"shouldHave": false "shouldHave": false
}, },
@@ -125,7 +125,7 @@
], ],
"team_admin": [ "team_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "manage_public_channel_properties", "permission": "manage_public_channel_properties",
"shouldHave": false "shouldHave": false
}, },
@@ -142,7 +142,7 @@
], ],
"system_admin": [ "system_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "manage_public_channel_properties", "permission": "manage_public_channel_properties",
"shouldHave": false "shouldHave": false
}, },
@@ -161,14 +161,14 @@
"restrictPublicChannelDeletion": { "restrictPublicChannelDeletion": {
"all": [ "all": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "delete_public_channel", "permission": "delete_public_channel",
"shouldHave": true "shouldHave": true
} }
], ],
"channel_admin": [ "channel_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "delete_public_channel", "permission": "delete_public_channel",
"shouldHave": false "shouldHave": false
}, },
@@ -185,7 +185,7 @@
], ],
"team_admin": [ "team_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "delete_public_channel", "permission": "delete_public_channel",
"shouldHave": false "shouldHave": false
}, },
@@ -202,7 +202,7 @@
], ],
"system_admin": [ "system_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "delete_public_channel", "permission": "delete_public_channel",
"shouldHave": false "shouldHave": false
}, },
@@ -221,14 +221,14 @@
"restrictPrivateChannelManagement": { "restrictPrivateChannelManagement": {
"all": [ "all": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "manage_private_channel_properties", "permission": "manage_private_channel_properties",
"shouldHave": true "shouldHave": true
} }
], ],
"channel_admin": [ "channel_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "manage_private_channel_properties", "permission": "manage_private_channel_properties",
"shouldHave": false "shouldHave": false
}, },
@@ -245,7 +245,7 @@
], ],
"team_admin": [ "team_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "manage_private_channel_properties", "permission": "manage_private_channel_properties",
"shouldHave": false "shouldHave": false
}, },
@@ -262,7 +262,7 @@
], ],
"system_admin": [ "system_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "manage_private_channel_properties", "permission": "manage_private_channel_properties",
"shouldHave": false "shouldHave": false
}, },
@@ -341,14 +341,14 @@
"restrictPrivateChannelDeletion": { "restrictPrivateChannelDeletion": {
"all": [ "all": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "delete_private_channel", "permission": "delete_private_channel",
"shouldHave": true "shouldHave": true
} }
], ],
"channel_admin": [ "channel_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "delete_private_channel", "permission": "delete_private_channel",
"shouldHave": false "shouldHave": false
}, },
@@ -365,7 +365,7 @@
], ],
"team_admin": [ "team_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "delete_private_channel", "permission": "delete_private_channel",
"shouldHave": false "shouldHave": false
}, },
@@ -382,7 +382,7 @@
], ],
"system_admin": [ "system_admin": [
{ {
"roleName": "channel_user", "roleName": "team_user",
"permission": "delete_private_channel", "permission": "delete_private_channel",
"shouldHave": false "shouldHave": false
}, },
@@ -529,4 +529,4 @@
} }
] ]
} }
} }