Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-15 01:41:40 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1682] Updated data migration scripts to bump the account revision date

Browse Source
This commit is contained in:
Rui Tome 2024-01-10 12:34:36 +00:00
parent fcd2dd380d
commit 8bf17eb198
No known key found for this signature in database
GPG Key ID: 526239D96A8EC066
3 changed files with 122 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
util/Migrator/DbScripts_transition/2023-12-06_00_AccessAllCollectionGroups.sql
View File

@ -29,5 +29,27 @@ SET [AccessAll] = 0
FROM [dbo].[Group] G FROM [dbo].[Group] G
INNER JOIN #TempGroup TG ON G.[Id] = TG.[GroupId] INNER JOIN #TempGroup TG ON G.[Id] = TG.[GroupId]
-- Step 5: Drop the temporary table -- Step 5: Bump the account revision date for each unique OrganizationId in #TempGroup
DECLARE @OrganizationId UNIQUEIDENTIFIER
DECLARE OrgIdCursor CURSOR FOR
SELECT DISTINCT [OrganizationId]
FROM #TempGroup
OPEN OrgIdCursor
FETCH NEXT FROM OrgIdCursor INTO @OrganizationId
WHILE (@@FETCH_STATUS = 0)
BEGIN
-- Execute the stored procedure for the current OrganizationId
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-- Fetch the next OrganizationId
FETCH NEXT FROM OrgIdCursor INTO @OrganizationId
END
CLOSE OrgIdCursor
DEALLOCATE OrgIdCursor;
-- Step 6: Drop the temporary table
DROP TABLE #TempGroup; DROP TABLE #TempGroup;

24
util/Migrator/DbScripts_transition/2023-12-06_01_AccessAllCollectionUsers.sql
View File

@ -36,5 +36,27 @@ SET [AccessAll] = 0
FROM [dbo].[OrganizationUser] OU FROM [dbo].[OrganizationUser] OU
INNER JOIN #TempOrgUser T ON OU.[Id] = T.[OrganizationUserId] INNER JOIN #TempOrgUser T ON OU.[Id] = T.[OrganizationUserId]
-- Step 5: Drop the temporary table -- Step 5: Bump the account revision date for each unique OrganizationId in #TempOrgUser
DECLARE @OrganizationId UNIQUEIDENTIFIER
DECLARE OrgIdCursor CURSOR FOR
SELECT DISTINCT [OrganizationId]
FROM #TempOrgUser
OPEN OrgIdCursor
FETCH NEXT FROM OrgIdCursor INTO @OrganizationId
WHILE (@@FETCH_STATUS = 0)
BEGIN
-- Execute the stored procedure for the current OrganizationId
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-- Fetch the next OrganizationId
FETCH NEXT FROM OrgIdCursor INTO @OrganizationId
END
CLOSE OrgIdCursor
DEALLOCATE OrgIdCursor;
-- Step 6: Drop the temporary table
DROP TABLE #TempOrgUser; DROP TABLE #TempOrgUser;

103
util/Migrator/DbScripts_transition/2023-12-06_02_ManagersEditAssignedCollectionUsers.sql
View File

@ -1,33 +1,82 @@
-- Step 1: Update [dbo].[CollectionUser] with [Manage] = 1 for all users with Manager role or 'EditAssignedCollections' permission -- Step 1: Update [dbo].[CollectionUser] with [Manage] = 1 for all users with Manager role or 'EditAssignedCollections' permission
UPDATE cu -- Store the results in a temporary table
SET cu.[ReadOnly] = 0, SELECT ou.[Id] AS [OrganizationUserId]
cu.[HidePasswords] = 0, INTO #TempStep1
cu.[Manage] = 1 FROM [dbo].[OrganizationUser] ou
FROM [dbo].[CollectionUser] cu WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND
INNER JOIN [dbo].[OrganizationUser] ou ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'));
ON cu.[OrganizationUserId] = ou.[Id]
WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND -- Update [dbo].[CollectionUser] with [Manage] = 1 using the temporary table
ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true')) UPDATE cu
SET cu.[ReadOnly] = 0,
cu.[HidePasswords] = 0,
cu.[Manage] = 1
FROM [dbo].[CollectionUser] cu
INNER JOIN #TempStep1 temp ON cu.[OrganizationUserId] = temp.[OrganizationUserId];
-- Step 2: Insert rows to [dbo].[CollectionUser] for Managers and users with 'EditAssignedCollections' permission assigned to groups with collection access -- Step 2: Insert rows to [dbo].[CollectionUser] for Managers and users with 'EditAssignedCollections' permission assigned to groups with collection access
INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage]) -- Store the results in a temporary table
SELECT cg.[CollectionId], ou.[Id], 0, 0, 1 SELECT cg.[CollectionId], ou.[Id] AS [OrganizationUserId]
FROM [dbo].[CollectionGroup] cg INTO #TempStep2
INNER JOIN [dbo].[GroupUser] gu FROM [dbo].[CollectionGroup] cg
ON cg.GroupId = gu.GroupId INNER JOIN [dbo].[GroupUser] gu ON cg.GroupId = gu.GroupId
INNER JOIN [dbo].[OrganizationUser] ou INNER JOIN [dbo].[OrganizationUser] ou ON gu.OrganizationUserId = ou.[Id]
ON gu.OrganizationUserId = ou.[Id] WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'))
WHERE (ou.[Type] = 3 OR AND NOT EXISTS (
(ou.[Permissions] IS NOT NULL AND ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true')) SELECT 1 FROM [dbo].[CollectionUser] cu
AND NOT EXISTS ( WHERE cu.[CollectionId] = cg.[CollectionId] AND cu.[OrganizationUserId] = ou.[Id]
SELECT 1 FROM [dbo].[CollectionUser] cu );
WHERE cu.[CollectionId] = cg.[CollectionId] AND cu.[OrganizationUserId] = ou.[Id]
) -- Insert rows into [dbo].[CollectionUser] using the temporary table
INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage])
SELECT [CollectionId], [OrganizationUserId], 0, 0, 1
FROM #TempStep2;
-- Step 3: Set all Managers to Users -- Step 3: Set all Managers to Users
UPDATE [dbo].[OrganizationUser] -- Store the results in a temporary table
SET [Type] = 2 -- User SELECT [Id] AS [OrganizationUserId]
WHERE [OrganizationId] = @OrganizationId INTO #TempStep3
AND [Type] = 3; -- Manager FROM [dbo].[OrganizationUser]
WHERE [Type] = 3; -- Manager
-- TODO: clear custom permissions JSON? Probably should, but not actually used by any code once we enable FC -- Update [dbo].[OrganizationUser] based on the temporary table
UPDATE ou
SET ou.[Type] = 2 -- User
FROM [dbo].[OrganizationUser] ou
INNER JOIN #TempStep3 temp ON ou.[Id] = temp.[OrganizationUserId];
-- Step 4: Bump the account revision date for each unique OrganizationUserId in #TempStep1, #TempStep2, and #TempStep3
-- Join the three temporary tables to get unique OrganizationUserId
SELECT DISTINCT temp1.[OrganizationUserId]
INTO #TempUniqueOrganizationUser
FROM #TempStep1 temp1
JOIN #TempStep2 temp2 ON temp1.[OrganizationUserId] = temp2.[OrganizationUserId]
JOIN #TempStep3 temp3 ON temp1.[OrganizationUserId] = temp3.[OrganizationUserId];
-- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
DECLARE @OrganizationUserId UNIQUEIDENTIFIER
DECLARE UniqueOrgUserIdCursor CURSOR FOR
SELECT [OrganizationUserId]
FROM #TempUniqueOrganizationUser
OPEN UniqueOrgUserIdCursor
FETCH NEXT FROM UniqueOrgUserIdCursor INTO @OrganizationUserId
WHILE (@@FETCH_STATUS = 0)
BEGIN
-- Execute the stored procedure for the current OrganizationUserId
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @OrganizationUserId
-- Fetch the next row
FETCH NEXT FROM UniqueOrgUserIdCursor INTO @OrganizationUserId
END
CLOSE UniqueOrgUserIdCursor
DEALLOCATE UniqueOrgUserIdCursor;
-- Step 5: Clean up temporary tables
DROP TABLE #TempStep1;
DROP TABLE #TempStep2;
DROP TABLE #TempStep3;
DROP TABLE #TempUniqueOrganizationUser;