nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 17:42:49 -05:00
Code Activity

[Soft Delete] - API updates for soft delete + retrieval

Browse Source
This commit is contained in:
Chad Scharf
2020-04-01 13:00:25 -04:00
parent fef512bad1
commit d014a597dd
28 changed files with 1279 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql
View File

@ -12,7 +12,8 @@
@FolderId UNIQUEIDENTIFIER,
@Favorite BIT,
@Edit BIT, -- not used
@OrganizationUseTotp BIT -- not used
@OrganizationUseTotp BIT, -- not used
@DeletedDate DATETIME2(7) -- not used
AS
BEGIN
SET NOCOUNT ON

3
src/Sql/dbo/Stored Procedures/CipherDetails_CreateWithCollections.sql
View File

@ -13,13 +13,14 @@
@Favorite BIT,
@Edit BIT, -- not used
@OrganizationUseTotp BIT, -- not used
@DeletedDate DATETIME2(7), -- not used
@CollectionIds AS [dbo].[GuidIdArray] READONLY
AS
BEGIN
SET NOCOUNT ON
EXEC [dbo].[CipherDetails_Create] @Id, @UserId, @OrganizationId, @Type, @Data, @Favorites, @Folders,
@Attachments, @CreationDate, @RevisionDate, @FolderId, @Favorite, @Edit, @OrganizationUseTotp
@Attachments, @CreationDate, @RevisionDate, @FolderId, @Favorite, @Edit, @OrganizationUseTotp, @DeletedDate
DECLARE @UpdateCollectionsSuccess INT
EXEC @UpdateCollectionsSuccess = [dbo].[Cipher_UpdateCollections] @Id, @UserId, @OrganizationId, @CollectionIds

6
src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserId.sql
View File

@ -1,6 +1,5 @@
CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserId]
@UserId UNIQUEIDENTIFIER,
@Deleted BIT
@UserId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
@ -9,7 +8,4 @@ BEGIN
*
FROM
[dbo].[UserCipherDetails](@UserId)
WHERE
(@Deleted = 1 AND [DeletedDate] IS NOT NULL)
OR (@Deleted = 0 AND [DeletedDate] IS NULL)
END

8
src/Sql/dbo/Stored Procedures/CipherDetails_ReadWithoutOrganizationsByUserId.sql
View File

@ -1,6 +1,5 @@
CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
@UserId UNIQUEIDENTIFIER,
@Deleted BIT
@UserId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
@ -13,9 +12,4 @@ BEGIN
[dbo].[CipherDetails](@UserId)
WHERE
[UserId] = @UserId
AND
(
(@Deleted = 1 AND [DeletedDate] IS NOT NULL)
OR (@Deleted = 0 AND [DeletedDate] IS NULL)
)
END

3
src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql
View File

@ -12,7 +12,8 @@
@FolderId UNIQUEIDENTIFIER,
@Favorite BIT,
@Edit BIT, -- not used
@OrganizationUseTotp BIT -- not used
@OrganizationUseTotp BIT, -- not used
@DeletedDate DATETIME2(2) -- not used
AS
BEGIN
SET NOCOUNT ON

8
src/Sql/dbo/Stored Procedures/CipherOrganizationDetails_ReadById.sql
View File

@ -1,6 +1,5 @@
CREATE PROCEDURE [dbo].[CipherOrganizationDetails_ReadById]
@Id UNIQUEIDENTIFIER,
@Deleted BIT
@Id UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
@ -17,9 +16,4 @@ BEGIN
[dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
WHERE
C.[Id] = @Id
AND
(
(@Deleted = 1 AND [DeletedDate] IS NOT NULL)
OR (@Deleted = 0 AND [DeletedDate] IS NULL)
)
END

3
src/Sql/dbo/Stored Procedures/Cipher_Create.sql
View File

@ -8,7 +8,8 @@
@Folders NVARCHAR(MAX),
@Attachments NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7)
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7) -- not used
AS
BEGIN
SET NOCOUNT ON

3
src/Sql/dbo/Stored Procedures/Cipher_CreateWithCollections.sql
View File

@ -9,13 +9,14 @@
@Attachments NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7), -- not used
@CollectionIds AS [dbo].[GuidIdArray] READONLY
AS
BEGIN
SET NOCOUNT ON
EXEC [dbo].[Cipher_Create] @Id, @UserId, @OrganizationId, @Type, @Data, @Favorites, @Folders,
@Attachments, @CreationDate, @RevisionDate
@Attachments, @CreationDate, @RevisionDate, @DeletedDate
DECLARE @UpdateCollectionsSuccess INT
EXEC @UpdateCollectionsSuccess = [dbo].[Cipher_UpdateCollections] @Id, @UserId, @OrganizationId, @CollectionIds

57
src/Sql/dbo/Stored Procedures/Cipher_Delete.sql
View File

@ -1,7 +1,6 @@
CREATE PROCEDURE [dbo].[Cipher_Delete]
@Ids AS [dbo].[GuidIdArray] READONLY,
@UserId AS UNIQUEIDENTIFIER,
@Permanent AS BIT
@UserId AS UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
@ -27,23 +26,11 @@ BEGIN
AND [Id] IN (SELECT * FROM @Ids)
-- Delete ciphers
IF @Permanent = 1
BEGIN
DELETE
FROM
[dbo].[Cipher]
WHERE
[Id] IN (SELECT [Id] FROM #Temp)
END
ELSE
BEGIN
UPDATE
[dbo].[Cipher]
SET
[DeletedDate] = SYSUTCDATETIME()
WHERE
[Id] IN (SELECT [Id] FROM #Temp)
END
DELETE
FROM
[dbo].[Cipher]
WHERE
[Id] IN (SELECT [Id] FROM #Temp)
-- Cleanup orgs
DECLARE @OrgId UNIQUEIDENTIFIER
@ -59,11 +46,7 @@ BEGIN
OPEN [OrgCursor]
FETCH NEXT FROM [OrgCursor] INTO @OrgId
WHILE @@FETCH_STATUS = 0 BEGIN
-- Storage cleanup for groups only matters if we're permanently deleting
IF @Permanent = 1
BEGIN
EXEC [dbo].[Organization_UpdateStorage] @OrgId
END
EXEC [dbo].[Organization_UpdateStorage] @OrgId
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
FETCH NEXT FROM [OrgCursor] INTO @OrgId
END
@ -71,22 +54,18 @@ BEGIN
DEALLOCATE [OrgCursor]
-- Cleanup user
IF @Permanent = 1
BEGIN
-- Storage cleanup for users only matters if we're permanently deleting
DECLARE @UserCiphersWithStorageCount INT
SELECT
@UserCiphersWithStorageCount = COUNT(1)
FROM
#Temp
WHERE
[UserId] IS NOT NULL
AND [Attachments] = 1
DECLARE @UserCiphersWithStorageCount INT
SELECT
@UserCiphersWithStorageCount = COUNT(1)
FROM
#Temp
WHERE
[UserId] IS NOT NULL
AND [Attachments] = 1
IF @UserCiphersWithStorageCount > 0
BEGIN
EXEC [dbo].[User_UpdateStorage] @UserId
END
IF @UserCiphersWithStorageCount > 0
BEGIN
EXEC [dbo].[User_UpdateStorage] @UserId
END
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId

31
src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql
View File

@ -1,6 +1,5 @@
CREATE PROCEDURE [dbo].[Cipher_DeleteById]
@Id UNIQUEIDENTIFIER,
@Permanent AS BIT
@Id UNIQUEIDENTIFIER
WITH RECOMPILE
AS
BEGIN
@ -18,28 +17,16 @@ BEGIN
[dbo].[Cipher]
WHERE
[Id] = @Id
IF @Permanent = 1
BEGIN
DELETE
FROM
[dbo].[Cipher]
WHERE
[Id] = @Id
END
ELSE
BEGIN
UPDATE
[dbo].[Cipher]
SET
[DeletedDate] = SYSUTCDATETIME()
WHERE
[Id] = @Id
END
DELETE
FROM
[dbo].[Cipher]
WHERE
[Id] = @Id
IF @OrganizationId IS NOT NULL
BEGIN
IF @Attachments = 1 AND @Permanent = 1
IF @Attachments = 1
BEGIN
EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
END
@ -47,7 +34,7 @@ BEGIN
END
ELSE IF @UserId IS NOT NULL
BEGIN
IF @Attachments = 1 AND @Permanent = 1
IF @Attachments = 1
BEGIN
EXEC [dbo].[User_UpdateStorage] @UserId
END

8
src/Sql/dbo/Stored Procedures/Cipher_ReadByOrganizationId.sql
View File

@ -1,6 +1,5 @@
CREATE PROCEDURE [dbo].[Cipher_ReadByOrganizationId]
@OrganizationId UNIQUEIDENTIFIER,
@Deleted BIT
@OrganizationId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
@ -12,9 +11,4 @@ BEGIN
WHERE
[UserId] IS NULL
AND [OrganizationId] = @OrganizationId
AND
(
(@Deleted = 1 AND [DeletedDate] IS NOT NULL)
OR (@Deleted = 0 AND [DeletedDate] IS NULL)
)
END

58
src/Sql/dbo/Stored Procedures/Cipher_Restore.sql Normal file
View File

@ -0,0 +1,58 @@
CREATE PROCEDURE [dbo].[Cipher_Restore]
@Ids AS [dbo].[GuidIdArray] READONLY,
@UserId AS UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
CREATE TABLE #Temp
(
[Id] UNIQUEIDENTIFIER NOT NULL,
[UserId] UNIQUEIDENTIFIER NULL,
[OrganizationId] UNIQUEIDENTIFIER NULL
)
INSERT INTO #Temp
SELECT
[Id],
[UserId],
[OrganizationId]
FROM
[dbo].[UserCipherDetails](@UserId)
WHERE
[Edit] = 1
AND [Id] IN (SELECT * FROM @Ids)
UPDATE
[dbo].[Cipher]
SET
[DeletedDate] = NULL,
[RevisionDate] = GETUTCDATE()
WHERE
[Id] IN (SELECT [Id] FROM #Temp)
-- Bump orgs
DECLARE @OrgId UNIQUEIDENTIFIER
DECLARE [OrgCursor] CURSOR FORWARD_ONLY FOR
SELECT
[OrganizationId]
FROM
#Temp
WHERE
[OrganizationId] IS NOT NULL
GROUP BY
[OrganizationId]
OPEN [OrgCursor]
FETCH NEXT FROM [OrgCursor] INTO @OrgId
WHILE @@FETCH_STATUS = 0 BEGIN
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
FETCH NEXT FROM [OrgCursor] INTO @OrgId
END
CLOSE [OrgCursor]
DEALLOCATE [OrgCursor]
-- Bump user
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
DROP TABLE #Temp
END

34
src/Sql/dbo/Stored Procedures/Cipher_RestoreById.sql Normal file
View File

@ -0,0 +1,34 @@
CREATE PROCEDURE [dbo].[Cipher_RestoreById]
@Id UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
DECLARE @UserId UNIQUEIDENTIFIER
DECLARE @OrganizationId UNIQUEIDENTIFIER
SELECT TOP 1
@UserId = [UserId],
@OrganizationId = [OrganizationId]
FROM
[dbo].[Cipher]
WHERE
[Id] = @Id
UPDATE
[dbo].[Cipher]
SET
[DeletedDate] = NULL,
[RevisionDate] = GETUTCDATE()
WHERE
[Id] = @Id
IF @OrganizationId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
END
ELSE IF @UserId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
END
END

58
src/Sql/dbo/Stored Procedures/Cipher_SoftDelete.sql Normal file
View File

@ -0,0 +1,58 @@
CREATE PROCEDURE [dbo].[Cipher_SoftDelete]
@Ids AS [dbo].[GuidIdArray] READONLY,
@UserId AS UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
CREATE TABLE #Temp
(
[Id] UNIQUEIDENTIFIER NOT NULL,
[UserId] UNIQUEIDENTIFIER NULL,
[OrganizationId] UNIQUEIDENTIFIER NULL
)
INSERT INTO #Temp
SELECT
[Id],
[UserId],
[OrganizationId]
FROM
[dbo].[UserCipherDetails](@UserId)
WHERE
[Edit] = 1
AND [Id] IN (SELECT * FROM @Ids)
-- Delete ciphers
UPDATE
[dbo].[Cipher]
SET
[DeletedDate] = SYSUTCDATETIME(),
[RevisionDate] = GETUTCDATE()
WHERE
[Id] IN (SELECT [Id] FROM #Temp)
-- Cleanup orgs
DECLARE @OrgId UNIQUEIDENTIFIER
DECLARE [OrgCursor] CURSOR FORWARD_ONLY FOR
SELECT
[OrganizationId]
FROM
#Temp
WHERE
[OrganizationId] IS NOT NULL
GROUP BY
[OrganizationId]
OPEN [OrgCursor]
FETCH NEXT FROM [OrgCursor] INTO @OrgId
WHILE @@FETCH_STATUS = 0 BEGIN
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
FETCH NEXT FROM [OrgCursor] INTO @OrgId
END
CLOSE [OrgCursor]
DEALLOCATE [OrgCursor]
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
DROP TABLE #Temp
END

35
src/Sql/dbo/Stored Procedures/Cipher_SoftDeleteById.sql Normal file
View File

@ -0,0 +1,35 @@
CREATE PROCEDURE [dbo].[Cipher_SoftDeleteById]
@Id UNIQUEIDENTIFIER
WITH RECOMPILE
AS
BEGIN
SET NOCOUNT ON
DECLARE @UserId UNIQUEIDENTIFIER
DECLARE @OrganizationId UNIQUEIDENTIFIER
SELECT TOP 1
@UserId = [UserId],
@OrganizationId = [OrganizationId]
FROM
[dbo].[Cipher]
WHERE
[Id] = @Id
UPDATE
[dbo].[Cipher]
SET
[DeletedDate] = SYSUTCDATETIME(),
[RevisionDate] = GETUTCDATE()
WHERE
[Id] = @Id
IF @OrganizationId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
END
ELSE IF @UserId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
END
END

3
src/Sql/dbo/Stored Procedures/Cipher_Update.sql
View File

@ -8,7 +8,8 @@
@Folders NVARCHAR(MAX),
@Attachments NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7)
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7) -- not used
AS
BEGIN
SET NOCOUNT ON

2
src/Sql/dbo/Stored Procedures/Cipher_UpdateWithCollections.sql
View File

@ -9,6 +9,7 @@
@Attachments NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7), -- not used
@CollectionIds AS [dbo].[GuidIdArray] READONLY
AS
BEGIN
@ -35,6 +36,7 @@ BEGIN
[Attachments] = @Attachments,
[RevisionDate] = @RevisionDate
-- No need to update CreationDate, Favorites, Folders, or Type since that data will not change
-- Do not update DeletedDate because that is a separate atomic action
WHERE
[Id] = @Id