[PM-18085] Add Manage property to UserCipherDetails #5390
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ganization properties
…bility - Split large test method into smaller, focused methods - Added helper methods for creating test data and performing assertions - Improved test coverage for cipher permissions in different scenarios - Maintained existing test logic while enhancing code structure
- Removed redundant helper methods for permission assertions - Simplified test methods for GetCipherPermissionsForOrganizationAsync, GetManyByUserIdAsync, and GetByIdAsync - Maintained existing test coverage for cipher manage permissions - Improved code readability and reduced code duplication
…missions - Added new test method GetCipherPermissionsForOrganizationAsync_ManageProperty_RespectsCollectionGroupRules - Implemented helper method CreateCipherInOrganizationCollectionWithGroup to support group-based collection permission testing - Verified manage permissions are correctly applied based on group collection access settings
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5390 +/- ##
==========================================
+ Coverage 44.47% 47.39% +2.92%
==========================================
Files 1511 1511
Lines 70253 70295 +42
Branches 6338 6338
==========================================
+ Hits 31242 33317 +2075
+ Misses 37669 35587 -2082
- Partials 1342 1391 +49 ☔ View full report in Codecov by Sentry. |
- Updated CipherDetails_Create, CipherDetails_CreateWithCollections, and CipherDetails_Update stored procedures - Added @manage parameter with comment "-- not used" - Included new stored procedure implementations in migration script - Consistent with previous work on adding Manage property to cipher details
|
New Issues (135)Checkmarx found the following issues in this Pull Request
Fixed Issues (24)Great job! The following issues were fixed in this Pull Request
|
JimmyVo16
reviewed
Feb 13, 2025
| Assert.True(personalDetails.Manage, "Personal ciphers should always have Manage permission"); | ||
| } | ||
|
|
||
| private async Task<(User user, Organization org, OrganizationUser orgUser)> CreateTestUserAndOrganization( |
There was a problem hiding this comment.
Good work on making these helper methods to make the tests easier to read.
JimmyVo16
previously approved these changes
Feb 13, 2025
|
@shane-melton do you mind taking a look at this, just given that we discussed it and it's probably one of the more complex changes we're making. Thanks. |
shane-melton
previously approved these changes
Feb 19, 2025
util/Migrator/DbScripts/2025-02-11_00_UserCipherDetailsManage.sql
Outdated
Show resolved
Hide resolved
src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs
Outdated
Show resolved
Hide resolved
shane-melton
approved these changes
Feb 19, 2025
JimmyVo16
approved these changes
Feb 19, 2025
rkac-bw
approved these changes
Feb 20, 2025
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-18085
📔 Objective
Changes Made
Manageproperty toUserCipherDetailsSQL function and EF queryManageproperty behavior across:Technical Details
The EF query required restructuring because it wasn't correctly evaluating permissions for ciphers that users had access to through both groups and collections. The original logic didn't match the SQL function's behavior for permission evaluation.
The solution was to:
Testing
Added integration tests that verify the
Manageproperty is correctly set:truefor user-owned cipherstruefor organization ciphers in collections where the user has Manage permissionfalsefor organization ciphers in collections where the user does not have Manage permissiontruefor organization ciphers in collections where the user's group has Manage permissionfalsefor organization ciphers in collections where the user's group does not have Manage permissionTests cover the
CipherRepositoryquery methods:GetCipherPermissionsForOrganizationAsyncGetManyByUserIdAsyncGetByIdAsync⏰ Reminders before review
🦮 Reviewer guidelines
:+1:) or similar for great changes:memo:) or ℹ️ (:information_source:) for notes or general info:question:) for questions:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion:art:) for suggestions / improvements:x:) or:warning:) for more significant problems or concerns needing attention:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt:pick:) for minor or nitpick changes