nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 21:48:12 -05:00
Code

Be explicit about AccessAll for ViewPassword

Browse Source
This commit is contained in:
hinton 2020-05-23 11:02:37 +02:00
parent 1c0095b122
commit 14a8224a99
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Sql/dbo/Functions/UserCipherDetails.sql
View File

@ -24,7 +24,9 @@ SELECT
END [Edit], END [Edit],
CASE CASE
WHEN WHEN
COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) = 0 OU.[AccessAll] = 1
OR G.[AccessAll] = 1
OR COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) = 0
THEN 1 THEN 1
ELSE 0 ELSE 0
END [ViewPassword], END [ViewPassword],

9
src/Sql/dbo/Functions/UserCollectionDetails.sql
View File

@ -11,7 +11,14 @@ SELECT
THEN 0 THEN 0
ELSE 1 ELSE 1
END [ReadOnly], END [ReadOnly],
COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) AS [HidePasswords] CASE
WHEN
OU.[AccessAll] = 1
OR G.[AccessAll] = 1
OR COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) = 0
THEN 0
ELSE 1
END [HidePasswords]
FROM FROM
[dbo].[CollectionView] C [dbo].[CollectionView] C
INNER JOIN INNER JOIN

17
util/Migrator/DbScripts/2020-05-22_00_HiddenPassword.sql
View File

@ -87,7 +87,9 @@ SELECT
END [Edit], END [Edit],
CASE CASE
WHEN WHEN
COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) = 0 OU.[AccessAll] = 1
OR G.[AccessAll] = 1
OR COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) = 0
THEN 1 THEN 1
ELSE 0 ELSE 0
END [ViewPassword], END [ViewPassword],
@ -150,7 +152,14 @@ SELECT
THEN 0 THEN 0
ELSE 1 ELSE 1
END [ReadOnly], END [ReadOnly],
COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) AS [HidePasswords] CASE
WHEN
OU.[AccessAll] = 1
OR G.[AccessAll] = 1
OR COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) = 0
THEN 0
ELSE 1
END [HidePasswords]
FROM FROM
[dbo].[CollectionView] C [dbo].[CollectionView] C
INNER JOIN INNER JOIN
@ -905,9 +914,9 @@ BEGIN
END END
GO GO
IF OBJECT_ID('[dbo].[CipherDetails_Create]') IS NOT NULL IF OBJECT_ID('[dbo].[CipherDetails_CreateWithCollections]') IS NOT NULL
BEGIN BEGIN
DROP PROCEDURE [dbo].[CipherDetails_Create] DROP PROCEDURE [dbo].[CipherDetails_CreateWithCollections]
END END
GO GO