1
0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 01:22:50 -05:00
Commit Graph

4202 Commits

Author SHA1 Message Date
c47ebedcfc [AC-1139] Added unit tests for OrganizationService InviteUser and SaveUser with EditAssignedCollections = true 2023-10-26 14:54:36 +01:00
021eaa444c [AC-1139] Added unit test to test setting users with EditAssignedCollections with Manage permission when saving a collection 2023-10-26 12:22:56 +01:00
9d8f6ac2c9 [AC-1139] Added unit tests for GroupAuthorizationHandler and OrganizationUserAuthorizationHandler 2023-10-26 11:24:35 +01:00
57d3abb994 [AC-1139] Fixed CollectionAuthorizationHandler unit tests 2023-10-25 21:05:54 +01:00
18592e4f0a Merge branch 'feature/flexible-collections' into flexible-collections/deprecate-custom-collection-perm
# Conflicts:
#	src/Api/AdminConsole/Controllers/GroupsController.cs
#	src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
#	src/Core/Services/Implementations/OrganizationService.cs
2023-10-25 16:29:21 +01:00
5c56b012c9 [AC-1139] Fixed Provider AuthorizationHandler logic for Groups and OrganizationUsers 2023-10-25 16:20:13 +01:00
e57469859c [AC-1139] Renamed existing CollectionAuthorizationHandler to BulkCollectionAuthorizationHandler for collections and created CollectionAuthorizationHandler for single item access. Fixed unit tests and created more 2023-10-25 16:19:25 +01:00
c11ba103a2 Merge branch 'master' into feature/flexible-collections 2023-10-24 11:14:36 -07:00
0fe97d7866 [AC-1648] [Flexible Collections] Bump migration scripts before feature branch merge (#3371)
* Bump dates on sql migration scripts

* Bump date on ef migrations
2023-10-24 11:13:49 -07:00
9007aa6556 Fix broken test (#3374) 2023-10-24 08:44:37 -04:00
20fe2bcc5b [AC-1139] Added an AuthorizationHandler for Collections and renamed existing to BulkCollectionAuthorizationHandler 2023-10-24 12:49:04 +01:00
f00dbf0052 [AC-1139] Added permission checks for GroupsController.Get if FC feature flag is enabled 2023-10-24 12:48:02 +01:00
3a5c35b556 [AC-1683] Fix DB migrations for new Manage permission (#3307)
* [AC-1683] Update migration script and introduce V2 procedures and types

* [AC-1683] Update repository calls to use new V2 procedures / types

* [AC-1684] Update bulk add collection migration script to use new V2 type

* [AC-1683] Undo Manage changes to more original procedures

* [AC-1683] Restore whitespace changes

* [AC-1683] Clarify comments regarding explicit column lists

* [AC-1683] Update migration script dates

* [AC-1683] Split the migration script for readability

* [AC-1683] Re-name SelectReadOnlyArray_V2 to CollectionAccessSelectionType
2023-10-23 18:46:14 -07:00
596e0df961 Fix: add missing namespace after merging in master 2023-10-24 11:42:04 +10:00
9d5c5bc444 Fix: add missing namespace after merging in master 2023-10-24 11:25:05 +10:00
d91eb23b46 Merge branch 'master' into feature/flexible-collections 2023-10-24 11:23:23 +10:00
ad27f3d87b [AC-1717] Update default values for LimitCollectionCreationDeletion (#3365)
* Change default value in organization create sproc to 1

* Drop old column name still present in some QA instances

* Set LimitCollectionCreationDeletion value in code based on feature flag
2023-10-24 10:46:32 +10:00
cb6c411b40 [AC-1748] Fixed logic to set manage = true for collections if user has EditAssignedCollection permission 2023-10-23 20:37:41 +01:00
c442bae2bc [AC-1693] Send InvoiceUpcoming Notification to Client Owners (#3319)
* Add Organization_ReadOwnerEmailAddresses SPROC

* Add IOrganizationRepository.GetOwnerEmailAddressesById

* Add SendInvoiceUpcoming overload for multiple emails

* Update InvoiceUpcoming handler to send multiple emails

* Cy's feedback

* Updates from testing

Hardened against missing entity IDs in Stripe events in the StripeEventService. Updated ValidateCloudRegion to not use a refresh/expansion for the customer because the invoice.upcoming event does not have an invoice.Id. Updated the StripeController's handling of invoice.upcoming to not use a refresh/expansion for the subscription because the invoice does not have an ID.

* Fix broken test
2023-10-23 13:46:29 -04:00
e64a7d5210 [AC-1139] Fixed formatting on OrganizationUsersController; renamed OrganizationUserOperations.Read to ReadAll 2023-10-23 17:23:02 +01:00
d7a19e0061 [AC-1139] Separated flexible collections logic from old logic in CollectionsController; Refactored CollectionAuthorizationHandler 2023-10-23 17:21:13 +01:00
18b43130e8 [PM-4252] Change attachment Size to be represented as a string (#3335) 2023-10-23 16:56:04 +02:00
19e2215376 Added percent off to discount, removed discount from user sub (#3326) 2023-10-23 15:02:02 +01:00
d7c544a116 [AC 1536] Breakdown The SubscriptionUpdate.cs into multiple files (#3356)
* Move sub-subscription classes to a separate files

* Refactor the sub-class to a separate files

* format whitespace

* remove directive that is unnecessary

* Remove the baseSeat class
2023-10-23 11:28:13 +01:00
cd376bee7f Merge remote-tracking branch 'origin/master' into feature/flexible-collections 2023-10-23 08:47:11 +10:00
52e723c57a Add joint codeownership for auth handlers (#3346) 2023-10-23 08:27:57 +10:00
403e63ca11 [AC-1139] Lining up collection access data with Manage = true if feature flag is off 2023-10-22 11:58:45 +01:00
76298829ed [AC-1139] Updated CollectionsController to use CollectionAuthorizationHandler in all endpoints if flag is enabled 2023-10-21 11:26:07 +01:00
dadf29f2c8 [AC-1139] Modified CollectionsController.Get to check access before getting collections 2023-10-20 15:17:39 +01:00
728cd1c0b5 [SM-949] Add endpoint to fetch events by service account (#3336)
* Add ability to fetch events by service account

* Extract GetDateRange into ApiHelpers util

* Add dapper implementation

* Add EF repo implementation

* Add authz handler case

* unit + integration tests for controller

* swap to read check

* Adding comments

* Fix integration tests from merge

* Enabled SM events controller for self-hosting
2023-10-19 16:57:14 -05:00
c1cf07d764 [AC-1750] AC Team code ownership moves - Groups (#3358) 2023-10-20 06:37:46 +10:00
1e2908ba5e [AC-1139] Updated CollectionsController GetManyWithDetails and Get to check for flexible collections flag 2023-10-19 20:58:01 +01:00
8c1a3a6e2d [AC-1748] Set resource as null when reading OrganizationUserUserDetailsResponseModel list 2023-10-19 16:16:07 +01:00
049fc2eb5b [AC-1748] Removed GroupAuthorizationHandler 2023-10-19 16:15:20 +01:00
dd8ffa2cbc Manually move future migrations (#3263)
* Manually move finalization migrations

* Rename the migrations to adhere to current EDD process

* Updated future migration for dropping UnknownDeviceVerificationEnabled column on User

* Moving src/Sql/dbo_future to src/Sql/dbo

* Delete files asking to be deleted

* Fix tab

* Updated migration for User tables update store procedures

* Fix formatting

* Fix User.sql table end comma

* Remove the future scripts that were added back in as finalization scripts by https://github.com/bitwarden/server/pull/3192/files

---------

Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
Co-authored-by: Hinton <hinton@users.noreply.github.com>
2023-10-19 07:59:46 -07:00
72b9392dea Merge branch 'feature/flexible-collections' into flexible-collections/deprecate-custom-collection-perm 2023-10-19 12:57:00 +01:00
1cad986900 [AC-1748] Reverted changes on OrganizationService 2023-10-19 12:43:28 +01:00
85de4351b0 [AC-1748] Created OrganizationUserAuthorizationHandler and modified OrganizationUsersController.Get to use that if flexible collections feature flag is enabled 2023-10-19 12:35:44 +01:00
09be61669f [AC-1748] Created GroupAuthorizationHandler and modified GroupsController.Get to use it if flexible collections feature flag is enabled 2023-10-19 12:34:55 +01:00
2f974d6b06 [AC-1748] Updated CurrentContext EditAssignedCollections, DeleteAssignedCollections, ViewAssignedCollections to check for flexible collections feature flag 2023-10-19 12:33:32 +01:00
1c0c6cc879 Update bitwarden/gh-actions digest to c970b0f (#3332)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-18 12:22:12 -04:00
95bf85dc6e [AC-1705] Update PayPal Verification URL to point to updated domain (#3338)
* change the url to match the paypal documentation

* Adding user-agent to the header

* Add a missing using statement

* Add more logs

* Resolving pr comments
2023-10-18 16:06:15 +00:00
37e9d70bee AC Team code ownership moves - Api project (#3351) 2023-10-18 11:27:56 -04:00
d230b10f82 Fix flaky UpdateSecretsManagerSubscriptionCommandTests (#3355)
Fix flaky UpdateSubscriptionAsync_ThrowsBadRequestException_WhenOccupiedSeatsExceedNewSeatTotal
test by expressly setting SmSeat value instead of relying on autodata.
This ensures that the new smSeat value is actually different.
2023-10-18 10:00:55 -05:00
e9be7f11f6 Add LaunchDarkly flag override file to .gitignore (#3357)
* Add `src/Identity/flags.json` to .gitignore

* Change to cover all OSS projects

* Include `bitwarden_license` projects
2023-10-18 15:54:07 +02:00
f7349b4ff2 Enable MsSqlMigratorUtility Dockerfile to run with additional parameters (#3348) 2023-10-18 09:40:49 -04:00
21219262a2 [PM-3779] idor allow the attacker to delete the victim domain (#3308)
* [PM-3779] Added IOrganizationDomainRepository.GetDomainByIdAndOrganizationIdAsync and SQL stored procedure

* [PM-3779] Changed GetOrganizationDomainByIdQuery to also take OrgId as a parameter. Updated existing unit tests and added new. Updated controller to match command changes

* [PM-3779] Removed type from url routes

* [PM-3779] Renamed IGetOrganizationDomainByIdAndOrganizationIdQuery to IGetOrganizationDomainByIdOrganizationIdQuery

* [PM-3779] Renamed GetOrganizationDomainByIdOrganizationIdQueryTests file and added more tests
2023-10-18 11:57:59 +01:00
cb73056c42 [AC-1654] idor allow the attacker to disable any one scim provising (#3325)
* [AC-1654] Added IOrganizationConnectionRepository.GetByIdOrganizationIdAsync and modified OrganizationConnectionsController to use it to get a connection matching both Id and OrganizationId

* [AC-1654] Fixed unit tests
2023-10-18 11:39:00 +01:00
ae18e76442 Merge remote-tracking branch 'origin/master' into feature/flexible-collections 2023-10-18 10:07:08 +10:00
3b049a64b8 [AC-1713] [Flexible collections] Add feature flags to server (#3334)
* Add feature flags for FlexibleCollections and BulkCollectionAccess

* Flag new routes and behaviour

---------

Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>
2023-10-18 07:16:01 +10:00