1
0
mirror of https://github.com/bitwarden/server synced 2025-12-30 07:03:42 +00:00
Commit Graph

1176 Commits

Author SHA1 Message Date
Rui Tome
9c5f580035 Merge branch 'feature/flexible-collections' into flexible-collections/deprecate-custom-collection-perm
# Conflicts:
#	src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
#	src/Core/Context/CurrentContext.cs
2023-10-27 15:06:13 +01:00
Thomas Rittson
8c78fc27c2 Merge remote-tracking branch 'origin/master' into feature/flexible-collections 2023-10-27 13:23:55 +10:00
Thomas Rittson
ad230fb6a5 [AC-1200] Admin Console code ownership - move OrganizationFeatures (#3369) 2023-10-26 16:47:44 -05:00
Thomas Rittson
26dd8b0e47 [AC-1284] AC Team code ownership moves - Provider (#3359) 2023-10-26 13:38:29 -04:00
Rui Tome
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
Rui Tome
5c56b012c9 [AC-1139] Fixed Provider AuthorizationHandler logic for Groups and OrganizationUsers 2023-10-25 16:20:13 +01:00
Rui Tome
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
Rui Tome
20fe2bcc5b [AC-1139] Added an AuthorizationHandler for Collections and renamed existing to BulkCollectionAuthorizationHandler 2023-10-24 12:49:04 +01:00
Rui Tome
f00dbf0052 [AC-1139] Added permission checks for GroupsController.Get if FC feature flag is enabled 2023-10-24 12:48:02 +01:00
Thomas Rittson
d91eb23b46 Merge branch 'master' into feature/flexible-collections 2023-10-24 11:23:23 +10:00
Rui Tome
e64a7d5210 [AC-1139] Fixed formatting on OrganizationUsersController; renamed OrganizationUserOperations.Read to ReadAll 2023-10-23 17:23:02 +01:00
Rui Tome
d7a19e0061 [AC-1139] Separated flexible collections logic from old logic in CollectionsController; Refactored CollectionAuthorizationHandler 2023-10-23 17:21:13 +01:00
Oscar Hinton
18b43130e8 [PM-4252] Change attachment Size to be represented as a string (#3335) 2023-10-23 16:56:04 +02:00
Alex Morask
19e2215376 Added percent off to discount, removed discount from user sub (#3326) 2023-10-23 15:02:02 +01:00
Thomas Rittson
cd376bee7f Merge remote-tracking branch 'origin/master' into feature/flexible-collections 2023-10-23 08:47:11 +10:00
Rui Tome
403e63ca11 [AC-1139] Lining up collection access data with Manage = true if feature flag is off 2023-10-22 11:58:45 +01:00
Rui Tome
76298829ed [AC-1139] Updated CollectionsController to use CollectionAuthorizationHandler in all endpoints if flag is enabled 2023-10-21 11:26:07 +01:00
Rui Tome
dadf29f2c8 [AC-1139] Modified CollectionsController.Get to check access before getting collections 2023-10-20 15:17:39 +01:00
Thomas Avery
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
Thomas Rittson
c1cf07d764 [AC-1750] AC Team code ownership moves - Groups (#3358) 2023-10-20 06:37:46 +10:00
Rui Tome
1e2908ba5e [AC-1139] Updated CollectionsController GetManyWithDetails and Get to check for flexible collections flag 2023-10-19 20:58:01 +01:00
Rui Tome
8c1a3a6e2d [AC-1748] Set resource as null when reading OrganizationUserUserDetailsResponseModel list 2023-10-19 16:16:07 +01:00
Rui Tome
049fc2eb5b [AC-1748] Removed GroupAuthorizationHandler 2023-10-19 16:15:20 +01:00
Rui Tome
72b9392dea Merge branch 'feature/flexible-collections' into flexible-collections/deprecate-custom-collection-perm 2023-10-19 12:57:00 +01:00
Rui Tome
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
Rui Tome
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
Thomas Rittson
37e9d70bee AC Team code ownership moves - Api project (#3351) 2023-10-18 11:27:56 -04:00
Rui Tomé
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
Rui Tomé
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
Thomas Rittson
ae18e76442 Merge remote-tracking branch 'origin/master' into feature/flexible-collections 2023-10-18 10:07:08 +10:00
Thomas Rittson
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
Andreas Coroiu
8c77c65ce8 [PM-1222] Passkeys in the Bitwarden vault (#2679)
* [EC-598] feat: add support for saving fido2 keys

* [EC-598] feat: add additional data

* [EC-598] feat: add counter, nonDiscoverableId; remove origin

* [EC-598] fix: previous incomplete commit

* [EC-598] fix: previous incomplete commit.. again

* [EC-598] fix: failed merge

* [EC-598] fix: move files around to match new structure

* [EC-598] feat: add implementation for non-discoverable credentials

* [EC-598] chore: remove some changes introduced by vs

* [EC-598] fix: linting issues

* [PM-1500] Add feature flag to enable pass keys (#2916)

* Added feature flag to enable pass keys

* Renamed enable pass keys to fido2 vault credentials

* only sync fido2key ciphers on clients >=2023.9.0 (#3244)

* Renamed fido2key property username to userDisplayName (#3172)

* [PM-1859] Renamed NonDiscoverableId to credentialId (#3198)

* PM-1859 Refactor to credentialId

* PM-1859 Removed unnecessary import

---------

Co-authored-by: Andreas Coroiu <andreas.coroiu@gmail.com>

* [PM-3807] Store all passkeys as login cipher type (#3261)

* [PM-3807] feat: add discoverable property to fido2key

* [PM-3807] feat: remove standalone Fido2Key

* [PM-3807] chore: clean up unusued constant

* [PM-3807] fix: remove standadlone Fido2Key property that I missed

* [PM-3807] Store passkeys in array (#3268)

* [PM-3807] feat: store passkeys in array

* [PM-3807] amazing adventures with the c# linter

* [PM-3980] Added creationDate property to the Fido2Key object (#3279)

* Added creationDate property to the Fido2Key object

* Fixed lint issues

* fixed comments

* made createionDate required

* [PM-3808] [Storage v2] Add old client/new server backward compatibility (#3262)

* [PM-3807] feat: add discoverable property to fido2key

* [PM-3807] feat: remove standalone Fido2Key

* [PM-3807] chore: clean up unusued constant

* [PM-3808] feat: add fido2 compatibility check before saving ciphers

* Resolved merge conflicts.

* Setting minimum version for QA.

---------

Co-authored-by: Todd Martin <tmartin@bitwarden.com>

* [PM-4054] Rename Fido2Key to Fido2Credential (#3306)

* Add server version compatibility check for Fido2Credentials on sharing with org (#3328)

* Added compatibility checks.

* Refactored into separate methods for easier removal.

* Added check on ShareMany

* Updated method order to be consistent.

* Linting

* Updated minimum server version for release, as well as defaulting the feature on for self-hosted.

* Added trailing space.

* Removed extra assignment

---------

Co-authored-by: gbubemismith <gsmithwalter@gmail.com>
Co-authored-by: SmithThe4th <gsmith@bitwarden.com>
Co-authored-by: Todd Martin <tmartin@bitwarden.com>
Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com>
Co-authored-by: Carlos Gonçalves <carlosmaccam@gmail.com>
Co-authored-by: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
2023-10-17 12:17:13 -04:00
cyprain-okeke
8177821e8b [AC 1451] Refactor staticstore plans and consuming logic (#3164)
* refactor the plan and create new objects

* initial commit

* Add new plan types

* continue the refactoring by adding new plantypes

* changes for plans

* Refactoring continues

* making changes for plan

* Fixing the failing test

* Fixing  whitespace

* Fix some in correct values

* Resolve the plan data

* rearranging the plan

* Make the plan more immutable

* Resolve the lint errors

* Fix the failing test

* Add custom plan

* Fix the failing test

* Fix the failing test

* resolve the failing addons after refactoring

* Refactoring

* Merge branch 'master' into ac-1451/refactor-staticstore-plans-and-consuming-logic

* merge from master

* Merge branch 'master' into ac-1451/refactor-staticstore-plans-and-consuming-logic

* format whitespace

* resolve the conflict

* Fix some pr comments

* Fixing some of the pr comments

* fixing some of the pr comments

* Resolve some pr comments

* Resolve pr comments

* Resolves some pr comments

* Resolving some or comments

* Resolve a failing test

* fix the failing test

* Resolving some pr comments

* Fix the failing test

* resolve pr comment

* add a using statement fir a failing test

---------

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
2023-10-17 15:56:35 +01:00
Thomas Avery
69529d394b [SM-891] Include Secrets Manager in organization license for self-hosting (#3222)
* Remove self-hosted restrictions from SM endpoints

* Add SM properties to organization license
2023-10-16 15:47:12 -05:00
Thomas Rittson
abb23dac61 Finish changing to property 2023-10-16 17:07:13 +10:00
Thomas Rittson
fc68bf2f0f Change FlexibleCollectionsIsEnabled method to property
Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>
2023-10-16 16:56:27 +10:00
Thomas Rittson
343ab2d8a9 Fix logic, add comment 2023-10-09 14:29:48 +10:00
Thomas Rittson
1dad2af7c3 Add missing flags 2023-10-09 14:15:33 +10:00
Thomas Rittson
8ebac62dff Restore old logic behind flags 2023-10-09 13:55:14 +10:00
Thomas Rittson
7aabe7ca59 Revert "Create LegacyCollectionsAuthorizationHandler and start to re-implement old logic"
This reverts commit fbb19cdadd.
2023-10-09 11:25:10 +10:00
Thomas Rittson
64ec62c143 Merge branch 'feature/flexible-collections' into flexible-collections/add-feature-flags 2023-10-09 10:56:58 +10:00
Vincent Salucci
0abd7c3a26 Merge branch 'master' into feature/flexible-collections 2023-10-05 15:37:20 -05:00
Vincent Salucci
279d0ccf62 [AC-1669] Bug - Remove obsolete assignUserId from CollectionService.SaveAsync(...) (#3312)
* fix: remove AssignUserId from CollectionService.SaveAsync, refs AC-1669

* fix: add manage access conditional before creating collection, refs AC-1669

* fix: move access logic for create/update, fix all tests, refs AC-1669

* fix: add CollectionAccessSelection fixture, update tests, update bad reqeuest message, refs AC-1669

* fix: format, refs AC-1669

* fix: update null params with specific arg.is null checks, refs Ac-1669

* fix: update attribute class name, refs AC-1669
2023-10-05 15:13:28 -05:00
Thomas Rittson
fbb19cdadd Create LegacyCollectionsAuthorizationHandler and start to re-implement old logic 2023-10-03 14:02:49 +10:00
Thomas Rittson
90db41a371 Update feature flag keys 2023-10-02 10:47:27 +10:00
Thomas Rittson
f7d05e2ffa Add feature flags constants and flag new route 2023-10-02 08:27:24 +10:00
Alex Morask
46117b194e Return discount info in Subscription responses [AC-1657] (#3278)
* Return whether customer has Stripe discount applied from /api/accounts/subscription

* Return whether customer has Stripe discount applied from /api/organizations/{id}/subscription
2023-09-29 12:29:43 -04:00
Vincent Salucci
fbb7aa1350 [AC-1666] Removed EditAnyCollection from Create/Delete permission checks (#3301)
* fix: remove EditAnyCollection from Create/Delete permission check, refs AC-1666

* fix: updated comment, refs AC-1666
2023-09-28 20:32:52 -05:00
Thomas Rittson
dd1061493c Merge branch 'master' into feature/flexible-collections 2023-09-29 09:23:47 +10:00
Todd Martin
7ede956c32 Individual Vault Item Encryption Feature (#3256)
* [SG-966] [SG-967] Add new cipher properties, update DB objects and create migrations (#2681)

* Updated cipher entity with two new columns

* Added sqlserver mifgration and updated applicable stored procedures and table

* Added EF Migrations

* Made changes to response model to include new column properties

* Fixed formatting

* Modified scripts to reflect suggestions made on PR

* Added column to cipher table using default

* Include constraint in create cipher table script

* Added key and forcerotatekey property to request model (#2716)

* Added key update on the Cipher_UpdateWithCollection stored procedure, ef (#2855)

* Added key and forceKeyRotation to BuildCiphersTable method (#2893)

* [PM-2211] Remove forceKeyRotation column (#2921)

* Removed forceKeyRotation column

* Adjusted date for migrtaion file

* Passed key column to update cipher script to update cipher key when it is rotated (#2967)

* [PM-2448] Update CipherDetails_Update SP to update attachment column (#2992)

* Updated the cipherdetails_update stored procedure to update the attachement column when encrypted with the cipher key

* Moved migration and renamed old migration file

* Fixed lint issues

* Fixed lint issues

* renamed sqlserver migration to have a more recent date

* [PM-2548] Added validation to edit and add attachments methods (#3130)

* PM-2548 Added validation to edit and add attachments methods

* PM-2548 Moved the validation to a private method

* PM-2548 Minor refactor

* Bumped up minimum version

* Bumped up minimum version

* Changed version for tests purposes

* Bumped up minimum version

* Updated encryption minimum version to match clients for QA.

* PM-3976 Passed Key column to update cipher on bulk edit (#3299)

* Updated minimum client version in preparation for release.

* Renamed migration with current date. (#3303)

---------

Co-authored-by: SmithThe4th <gsmith@bitwarden.com>
Co-authored-by: gbubemismith <gsmithwalter@gmail.com>
Co-authored-by: Carlos Gonçalves <cgoncalves@bitwarden.com>
Co-authored-by: Carlos Gonçalves <carlosmaccam@gmail.com>
2023-09-28 08:45:13 -04:00