bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-25 12:43:14 +00:00
Code Issues Releases Wiki Activity
4,143 Commits 480 Branches 222 Tags
9f4df46444fb3f61752b08f3a564e4e30fe7a011
Commit Graph

4143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rui Tome
9f4df46444 [AC-1139] Marked as obsolete the methods EditAssignedCollections, DeleteAssignedCollections and ViewAssignedCollections on ICurrentContext 2023-10-17 15:32:14 +01: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
b2f4b66193 Merge branch 'feature/flexible-collections' into flexible-collections/add-feature-flags 2023-10-13 15:59:08 +10:00
Thomas Rittson
6bc38ac3d1 Merge branch 'master' into feature/flexible-collections 2023-10-13 15:51:44 +10:00
MtnBurrit0
f228dcd668 Rename DbScripts_future and DbScripts_data_migrations (#3192) 
* Rename DbScripts_future and DbScripts_data_migrations

* Rename embeded folder name

* Remove new files from stale PR

---------

Co-authored-by: Michał Chęciński <mchecinski@bitwarden.com>
Co-authored-by: Michał Chęciński <michal.checinski@outlook.com>
 2023-10-12 12:42:28 -06:00
Thomas Rittson
53f5eee215 [AC-1638] Disallow Secrets Manager for MSP-managed organizations (#3297) 
* Block MSPs from creating orgs with SM

* Block MSPs from adding SM to a managed org

* Prevent manually adding SM to an MSP-managed org

* Revert "Prevent manually adding SM to an MSP-managed org"

This change is no longer required

This reverts commit 51b086243b.

* Block provider from adding org with SM

* Update error message when adding existing org with SM to provider

* Update check to match client

* Revert "Update check to match client"

This reverts commit f195c1c1f6.
 2023-10-12 15:56:50 +01:00
Justin Baur
79648b311e [PM-3555] Remove ClearTracker() (#3213) 
* Remove ClearTracker

* Remove from CipherRepositoryTests
 2023-10-12 11:15:02 +02:00
Thomas Rittson
01518de737 Use fixture instead of calling nsubstitute directly 2023-10-12 14:31:08 +10:00
Thomas Rittson
5bdeb7fbd2 Set feature flag to ON for auth handler tests 2023-10-12 12:15:11 +10:00
Thomas Rittson
a87236a520 Fix formatting 2023-10-12 12:12:14 +10:00
Alex Morask
b2af73f00f [PM-212] Sync Organization Billing Email from Stripe Webhook (#3305) 
* Add StripeFacade and StripeEventService

* Add StripeEventServiceTests

* Handle customer.updated event in StripeController
 2023-10-11 15:57:51 -04:00
Thomas Rittson
98b60cf817 Remove unused method 2023-10-11 14:49:46 +10:00
Thomas Rittson
60ea32bb1d Add FeatureServiceFixtures to set feature flags in test 2023-10-11 14:49:26 +10:00
Thomas Rittson
ea4b282c6b Restore legacy tests 2023-10-10 14:26:44 +10:00
Thomas Rittson
05192a9a8d Add EnableFeatureFlag extension method for tests 2023-10-10 14:15:43 +10:00
Thomas Rittson
d9b0f01b72 Fix tests 2023-10-09 14:44:18 +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
Thomas Rittson
fed325204d Merge remote-tracking branch 'origin/master' into feature/flexible-collections 2023-10-09 10:56:43 +10:00
Daniel James Smith
3a71e7b081 Add tech-leads as default owners (#3330) 
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
 2023-10-06 18:28:02 +02: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
renovate[bot]
4dcd467a5f Update crazy-max/ghaction-import-gpg action to v6 (#3315) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-05 14:59:23 -04:00
renovate[bot]
8c3ca2f1fa Update bitwarden/gh-actions digest to f112580 (#3314) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-05 14:58:13 -04:00
Conner Turnbull
cc68d84301 Added billing patterns to codeowners (#3322) 2023-10-04 12:05:44 -04: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
Todd Martin
9af9d121bf Updated client minimum version to reflect previous hotfixes. (#3311) 2023-09-29 15:44:54 -04: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
github-actions[bot]
12b03482ae Bumped version to 2023.9.1 (#3309) 
Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
 2023-09-29 15:40:07 +00: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
Michał Chęciński
3e90f57797 [DEVOPS-1519] Add transition mode to mssql migrator utility (#3259) 
* Add RerunableSqlTableJournal

* Add extension to use rerunable sql table journal

* Use rerunable sql journal

* format

* Enable logging

* FIx

* Disable logging

* Rename to SqlTableJournalExtensions

* Move RerunableSqlTableJournal to Extension class

* Fix usings

* Add rerunable schema

* Format

* Fix typo

* Enable logging in db migrator

* add rerunable column in dbo migrations table migration

* Trying

* Fix journal table name

* Trying to migrate first

* After migration

* Testing

* Add update from rerunable to not rerunable script

* Change name

* Add rerunable option and script folder name

* Add rerunable options and folder

* Fix

* Add transition (aka rerunable) migrations to Setup

* Parse parameters on migrator utility

* Fix sql scripts

* Remove CreateSchemaTableSql as it'll be migrated using migration

* Embed dbScripts_data_migration folder

* Remove testing sql script

* Add optins parsing nuget for msSqlMigratorUtility

* Fix sql journal

* Ran dotnet format

* Comment out index

* ▫️Revert "Comment out index"

This reverts commit df15fa91e0.

* Disable logging

* Add newline

* Rename rerunable to repeatable

* remove repeatable journal

* Remove migration adding the repeatable column in  dbo.Migrations table

* Add using

* Enable log for testing

* Disable logging in the setup

* Remove unused method

* Add migrator constants

* Use constants in yet another place

* Fix

* Add constant

* Fix

* Fix
 2023-09-28 16:29:52 +02: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
Thomas Rittson
30b91cd1a2 Merge branch 'master' into feature/flexible-collections 2023-09-27 11:26:06 +10:00
Thomas Rittson
a3f554a34e [AC-1646] Rename LimitCollectionCdOwnerAdmin column (#3300) 
* Rename LimitCollectionCdOwnerAdmin -> LimitCollectionCreationDeletion

* Rename and bump migration script
 2023-09-27 07:37:34 +10:00
Shane Melton
5d431adbd4 [AC-1174] Bulk Collection Management (#3229) 
* [AC-1174] Update SelectionReadOnlyRequestModel to use Guid for Id property

* [AC-1174] Introduce initial bulk-access collection endpoint

* [AC-1174] Introduce BulkAddCollectionAccessCommand and validation logic/tests

* [AC-1174] Add CreateOrUpdateAccessMany method to CollectionRepository

* [AC-1174] Add event logs for bulk add collection access command

* [AC-1174] Add User_BumpAccountRevisionDateByCollectionIds and database migration script

* [AC-1174] Implement EF repository method

* [AC-1174] Improve null checks

* [AC-1174] Remove unnecessary BulkCollectionAccessRequestModel helpers

* [AC-1174] Add unit tests for new controller endpoint

* [AC-1174] Fix formatting

* [AC-1174] Remove comment

* [AC-1174] Remove redundant organizationId parameter

* [AC-1174] Ensure user and group Ids are distinct

* [AC-1174] Cleanup tests based on PR feedback

* [AC-1174] Formatting

* [AC-1174] Update CollectionGroup alias in the sproc

* [AC-1174] Add some additional comments to SQL sproc

* [AC-1174] Add comment explaining additional SaveChangesAsync call

---------

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
 2023-09-26 09:30:07 -07:00
renovate[bot]
464dac8f4d Update bitwarden/gh-actions digest to fdcf1fc (#3230) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-26 10:30:28 -04:00
Thomas Rittson
2c7d02dcbb Merge branch 'master' into feature/flexible-collections 2023-09-26 10:40:26 +10:00
Matt Bishop
9db1007df6 Only log errors with LaunchDarkly (#3298) 2023-09-25 15:32:06 -04:00
Alex Morask
0b72eb8e45 Admin: Update Stripe Customer Email on Organization Edit (#3281) 
* Admin: Update Stripe customer email on organization billing email update

* Conner's feedback
 2023-09-25 10:16:19 -04:00
Cesar Gonzalez
44baba9229 [PM-4075] Setup Feature Flag for Browser Fileless Import (#3296) 2023-09-25 13:16:21 +00:00
renovate[bot]
e3dc515062 Update actions/checkout action to v4.1.0 (#3293) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 08:34:54 -04:00
Matt Bishop
bfe71e5056 Delete NuGet config (#3290) 2023-09-22 11:18:59 -04:00
Thomas Avery
46faecaade [SM-755] Add EF Secrets Manager cleanup on deletes (#3228) 
* Add Delete Cascade for EF AccessPolicy table

* Add AP removal on EF user deletion

* Remove SM entities on EF org delete
 2023-09-21 17:22:08 -05:00