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

MM-58525 Fix upload file permissions (#27298)

Просмотр исходного кода 
* tie create_post and upload_file permissions together

* update tests

* update file name

* update migration to do in batches

* Update 000122_remove_upload_file_permission.up.sql

* fix formatting

* simplify migrations, fix regex issue

* update file names for recent merge

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
Scott Bishel
2024-06-24 10:47:52 -06:00
коммит произвёл GitHub
родитель 6a2078ecf0
Коммит 71c25fb316
10 изменённых файлов: 130 добавлений и 10 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
server/channels/db/migrations/migrations.list
Просмотреть файл

@@ -242,6 +242,8 @@ channels/db/migrations/mysql/000121_remove_true_up_review_history.down.sql
channels/db/migrations/mysql/000121_remove_true_up_review_history.up.sql
channels/db/migrations/mysql/000122_preferences_value_length.down.sql
channels/db/migrations/mysql/000122_preferences_value_length.up.sql
channels/db/migrations/mysql/000123_remove_upload_file_permission.down.sql
channels/db/migrations/mysql/000123_remove_upload_file_permission.up.sql
channels/db/migrations/postgres/000001_create_teams.down.sql
channels/db/migrations/postgres/000001_create_teams.up.sql
channels/db/migrations/postgres/000002_create_team_members.down.sql
@@ -484,3 +486,5 @@ channels/db/migrations/postgres/000121_remove_true_up_review_history.down.sql
channels/db/migrations/postgres/000121_remove_true_up_review_history.up.sql
channels/db/migrations/postgres/000122_preferences_value_length.down.sql
channels/db/migrations/postgres/000122_preferences_value_length.up.sql
channels/db/migrations/postgres/000123_remove_upload_file_permission.down.sql
channels/db/migrations/postgres/000123_remove_upload_file_permission.up.sql

1
server/channels/db/migrations/mysql/000123_remove_upload_file_permission.down.sql Обычный файл
Просмотреть файл

@@ -0,0 +1 @@
-- Skipping it because the forward migrations are destructive

18
server/channels/db/migrations/mysql/000123_remove_upload_file_permission.up.sql Обычный файл
Просмотреть файл

@@ -0,0 +1,18 @@
CREATE PROCEDURE RemoveUuploadFilePermission()
BEGIN
updateRoles: LOOP
-- update affected rows
UPDATE Roles
SET Permissions = REGEXP_REPLACE(Permissions, 'upload_file([[:space:]]|$)', '')
WHERE Permissions like '%upload_file%' and Permissions not REGEXP 'create_post([[:space:]]|$)'
LIMIT 100;
-- check if the loop has completed
IF ROW_COUNT() < 100 THEN
LEAVE updateRoles;
END IF;
END LOOP updateRoles;
END;
CALL RemoveUuploadFilePermission();
DROP PROCEDURE IF EXISTS RemoveUuploadFilePermission;

1
server/channels/db/migrations/postgres/000123_remove_upload_file_permission.down.sql Обычный файл
Просмотреть файл

@@ -0,0 +1 @@
-- Skipping it because the forward migrations are destructive

18
server/channels/db/migrations/postgres/000123_remove_upload_file_permission.up.sql Обычный файл
Просмотреть файл

@@ -0,0 +1,18 @@
DO $$
<<remove_upload_file_permission>>
DECLARE
rows_updated integer;
BEGIN
LOOP
WITH table_holder AS (
SELECT id FROM roles
WHERE permissions ~~ '%upload_file%' AND permissions !~ 'create_post($|\s)'
ORDER BY id ASC limit 100
)
UPDATE Roles r set permissions = REGEXP_REPLACE(permissions, 'upload_file($|\s)', '')
WHERE r.id in (SELECT id FROM table_holder);
GET DIAGNOSTICS rows_updated = ROW_COUNT;
EXIT WHEN rows_updated < 100;
END LOOP;
END remove_upload_file_permission $$;

6
webapp/channels/src/components/admin_console/permission_schemes_settings/guest_permissions_tree/__snapshots__/guest_permissions_tree.test.tsx.snap
Просмотреть файл

@@ -70,6 +70,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
"id": "guest_create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
Object {
@@ -194,6 +195,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
"id": "guest_create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
Object {
@@ -311,6 +313,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
"id": "guest_create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
Object {
@@ -435,6 +438,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
"id": "guest_create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
Object {
@@ -559,6 +563,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
"id": "guest_create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
Object {
@@ -699,6 +704,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
"id": "guest_create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
Object {

9
webapp/channels/src/components/admin_console/permission_schemes_settings/guest_permissions_tree/guest_permissions_tree.tsx
Просмотреть файл

@@ -31,7 +31,14 @@ const GuestPermissionsTree = ({license, onToggle, readOnly, scope, selectRow, pa
Permissions.CREATE_PRIVATE_CHANNEL,
Permissions.EDIT_POST,
Permissions.DELETE_POST,
Permissions.CREATE_POST,
{
id: 'guest_' + Permissions.CREATE_POST,
combined: true,
permissions: [
Permissions.CREATE_POST,
Permissions.UPLOAD_FILE,
],
},
{
id: 'guest_reactions',
combined: true,

63
webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/__snapshots__/permissions_tree.test.tsx.snap
Просмотреть файл

@@ -151,7 +151,14 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
],
},
"use_channel_mentions",
"create_post",
Object {
"combined": true,
"id": "create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
],
},
Object {
@@ -345,7 +352,14 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
],
},
"use_channel_mentions",
"create_post",
Object {
"combined": true,
"id": "create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
],
},
Object {
@@ -536,7 +550,14 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
],
},
"use_channel_mentions",
"create_post",
Object {
"combined": true,
"id": "create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
],
},
Object {
@@ -738,7 +759,14 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
],
},
"use_channel_mentions",
"create_post",
Object {
"combined": true,
"id": "create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
],
},
Object {
@@ -940,7 +968,14 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
],
},
"use_channel_mentions",
"create_post",
Object {
"combined": true,
"id": "create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
],
},
Object {
@@ -1142,7 +1177,14 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
],
},
"use_channel_mentions",
"create_post",
Object {
"combined": true,
"id": "create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
],
},
Object {
@@ -1351,7 +1393,14 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
],
},
"use_channel_mentions",
"create_post",
Object {
"combined": true,
"id": "create_post",
"permissions": Array [
"create_post",
"upload_file",
],
},
],
},
Object {

10
webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.tsx
Просмотреть файл

@@ -249,8 +249,14 @@ export default class PermissionsTree extends React.PureComponent<Props, State> {
if (license?.IsLicensed === 'true' && license?.LDAPGroups === 'true' && !postsGroup.permissions.includes(Permissions.USE_GROUP_MENTIONS)) {
postsGroup.permissions.push(Permissions.USE_GROUP_MENTIONS);
}
postsGroup.permissions.push(Permissions.CREATE_POST);
postsGroup.permissions.push({
id: Permissions.CREATE_POST,
combined: true,
permissions: [
Permissions.CREATE_POST,
Permissions.UPLOAD_FILE,
],
});
if (config.ExperimentalSharedChannels === 'true') {
sharedChannelsGroup.permissions.push(Permissions.MANAGE_SHARED_CHANNELS);
sharedChannelsGroup.permissions.push(Permissions.MANAGE_SECURE_CONNECTIONS);

10
webapp/channels/src/components/admin_console/permission_schemes_settings/strings/groups.tsx
Просмотреть файл

@@ -35,6 +35,16 @@ export const groupRolesStrings: Record<string, Record<string, MessageDescriptor>
defaultMessage: 'Write, edit and delete posts.',
},
}),
create_post: defineMessages({
name: {
id: 'admin.permissions.permission.create_post.name',
defaultMessage: 'Create Posts',
},
description: {
id: 'admin.permissions.permission.create_post.description',
defaultMessage: 'Allow users to create posts.',
},
}),
private_channel: defineMessages({
name: {
id: 'admin.permissions.group.private_channel.name',