mirror of
https://github.com/bitwarden/server.git
synced 2024-11-24 12:35:25 +01:00
202dce3459
Final removal of AccessAll logic in CollectionCipher sprocs. We had v2 sprocs already containing this updated logic that were never used; copy the v2 logic back to the original sprocs so that we start using it. v2 sprocs will be dropped later.
214 lines
6.4 KiB
Transact-SQL
214 lines
6.4 KiB
Transact-SQL
-- Remove AccessAll from CollectionCipher sprocs
|
|
-- We created v2 versions of these, but the feature is now fully released, so this copies v2 changes back to non-versioned sproc
|
|
|
|
-- CollectionCipher_ReadByUserId
|
|
CREATE OR ALTER PROCEDURE [dbo].[CollectionCipher_ReadByUserId]
|
|
@UserId UNIQUEIDENTIFIER
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
SELECT
|
|
CC.*
|
|
FROM
|
|
[dbo].[CollectionCipher] CC
|
|
INNER JOIN
|
|
[dbo].[Collection] S ON S.[Id] = CC.[CollectionId]
|
|
INNER JOIN
|
|
[dbo].[OrganizationUser] OU ON OU.[OrganizationId] = S.[OrganizationId] AND OU.[UserId] = @UserId
|
|
LEFT JOIN
|
|
[dbo].[CollectionUser] CU ON CU.[CollectionId] = S.[Id] AND CU.[OrganizationUserId] = OU.[Id]
|
|
LEFT JOIN
|
|
[dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND GU.[OrganizationUserId] = OU.[Id]
|
|
LEFT JOIN
|
|
[dbo].[Group] G ON G.[Id] = GU.[GroupId]
|
|
LEFT JOIN
|
|
[dbo].[CollectionGroup] CG ON CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
|
|
WHERE
|
|
OU.[Status] = 2 -- Confirmed
|
|
AND (
|
|
CU.[CollectionId] IS NOT NULL
|
|
OR CG.[CollectionId] IS NOT NULL
|
|
)
|
|
END
|
|
GO
|
|
|
|
-- CollectionCipher_ReadByUserIdCipherId
|
|
CREATE OR ALTER PROCEDURE [dbo].[CollectionCipher_ReadByUserIdCipherId]
|
|
@UserId UNIQUEIDENTIFIER,
|
|
@CipherId UNIQUEIDENTIFIER
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
SELECT
|
|
CC.*
|
|
FROM
|
|
[dbo].[CollectionCipher] CC
|
|
INNER JOIN
|
|
[dbo].[Collection] S ON S.[Id] = CC.[CollectionId]
|
|
INNER JOIN
|
|
[dbo].[OrganizationUser] OU ON OU.[OrganizationId] = S.[OrganizationId] AND OU.[UserId] = @UserId
|
|
LEFT JOIN
|
|
[dbo].[CollectionUser] CU ON CU.[CollectionId] = S.[Id] AND CU.[OrganizationUserId] = OU.[Id]
|
|
LEFT JOIN
|
|
[dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND GU.[OrganizationUserId] = OU.[Id]
|
|
LEFT JOIN
|
|
[dbo].[Group] G ON G.[Id] = GU.[GroupId]
|
|
LEFT JOIN
|
|
[dbo].[CollectionGroup] CG ON CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
|
|
WHERE
|
|
CC.[CipherId] = @CipherId
|
|
AND OU.[Status] = 2 -- Confirmed
|
|
AND (
|
|
CU.[CollectionId] IS NOT NULL
|
|
OR CG.[CollectionId] IS NOT NULL
|
|
)
|
|
END
|
|
GO
|
|
|
|
-- CollectionCipher_UpdateCollections
|
|
CREATE OR ALTER PROCEDURE [dbo].[CollectionCipher_UpdateCollections]
|
|
@CipherId UNIQUEIDENTIFIER,
|
|
@UserId UNIQUEIDENTIFIER,
|
|
@CollectionIds AS [dbo].[GuidIdArray] READONLY
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
DECLARE @OrgId UNIQUEIDENTIFIER = (
|
|
SELECT TOP 1
|
|
[OrganizationId]
|
|
FROM
|
|
[dbo].[Cipher]
|
|
WHERE
|
|
[Id] = @CipherId
|
|
)
|
|
|
|
;WITH [AvailableCollectionsCTE] AS(
|
|
SELECT
|
|
C.[Id]
|
|
FROM
|
|
[dbo].[Collection] C
|
|
INNER JOIN
|
|
[Organization] O ON O.[Id] = C.[OrganizationId]
|
|
INNER JOIN
|
|
[dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
|
|
LEFT JOIN
|
|
[dbo].[CollectionUser] CU ON CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
|
|
LEFT JOIN
|
|
[dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND GU.[OrganizationUserId] = OU.[Id]
|
|
LEFT JOIN
|
|
[dbo].[Group] G ON G.[Id] = GU.[GroupId]
|
|
LEFT JOIN
|
|
[dbo].[CollectionGroup] CG ON CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
|
|
WHERE
|
|
O.[Id] = @OrgId
|
|
AND O.[Enabled] = 1
|
|
AND OU.[Status] = 2 -- Confirmed
|
|
AND (
|
|
CU.[ReadOnly] = 0
|
|
OR CG.[ReadOnly] = 0
|
|
)
|
|
),
|
|
[CollectionCiphersCTE] AS(
|
|
SELECT
|
|
[CollectionId],
|
|
[CipherId]
|
|
FROM
|
|
[dbo].[CollectionCipher]
|
|
WHERE
|
|
[CipherId] = @CipherId
|
|
)
|
|
MERGE
|
|
[CollectionCiphersCTE] AS [Target]
|
|
USING
|
|
@CollectionIds AS [Source]
|
|
ON
|
|
[Target].[CollectionId] = [Source].[Id]
|
|
AND [Target].[CipherId] = @CipherId
|
|
WHEN NOT MATCHED BY TARGET
|
|
AND [Source].[Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
|
|
INSERT VALUES
|
|
(
|
|
[Source].[Id],
|
|
@CipherId
|
|
)
|
|
WHEN NOT MATCHED BY SOURCE
|
|
AND [Target].[CipherId] = @CipherId
|
|
AND [Target].[CollectionId] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
|
|
DELETE
|
|
;
|
|
|
|
IF @OrgId IS NOT NULL
|
|
BEGIN
|
|
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
|
|
END
|
|
END
|
|
GO
|
|
|
|
-- CollectionCipher_UpdateCollectionsForCiphers
|
|
CREATE OR ALTER PROCEDURE [dbo].[CollectionCipher_UpdateCollectionsForCiphers]
|
|
@CipherIds AS [dbo].[GuidIdArray] READONLY,
|
|
@OrganizationId UNIQUEIDENTIFIER,
|
|
@UserId UNIQUEIDENTIFIER,
|
|
@CollectionIds AS [dbo].[GuidIdArray] READONLY
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
CREATE TABLE #AvailableCollections (
|
|
[Id] UNIQUEIDENTIFIER
|
|
)
|
|
|
|
INSERT INTO #AvailableCollections
|
|
SELECT
|
|
C.[Id]
|
|
FROM
|
|
[dbo].[Collection] C
|
|
INNER JOIN
|
|
[Organization] O ON O.[Id] = C.[OrganizationId]
|
|
INNER JOIN
|
|
[dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
|
|
LEFT JOIN
|
|
[dbo].[CollectionUser] CU ON CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
|
|
LEFT JOIN
|
|
[dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND GU.[OrganizationUserId] = OU.[Id]
|
|
LEFT JOIN
|
|
[dbo].[Group] G ON G.[Id] = GU.[GroupId]
|
|
LEFT JOIN
|
|
[dbo].[CollectionGroup] CG ON CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
|
|
WHERE
|
|
O.[Id] = @OrganizationId
|
|
AND O.[Enabled] = 1
|
|
AND OU.[Status] = 2 -- Confirmed
|
|
AND (
|
|
CU.[ReadOnly] = 0
|
|
OR CG.[ReadOnly] = 0
|
|
)
|
|
|
|
IF (SELECT COUNT(1) FROM #AvailableCollections) < 1
|
|
BEGIN
|
|
-- No writable collections available to share with in this organization.
|
|
RETURN
|
|
END
|
|
|
|
INSERT INTO [dbo].[CollectionCipher]
|
|
(
|
|
[CollectionId],
|
|
[CipherId]
|
|
)
|
|
SELECT
|
|
[Collection].[Id],
|
|
[Cipher].[Id]
|
|
FROM
|
|
@CollectionIds [Collection]
|
|
INNER JOIN
|
|
@CipherIds [Cipher] ON 1 = 1
|
|
WHERE
|
|
[Collection].[Id] IN (SELECT [Id] FROM #AvailableCollections)
|
|
|
|
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
|
|
END
|
|
GO
|