1
0
mirror of https://github.com/bitwarden/server.git synced 2025-04-15 10:08:14 -05:00

5692 Commits

Author SHA1 Message Date
Jonas Hendrickx
bb0eb50603
Address merge conflict due to moving code ownership and remove unused code block 2025-04-09 11:07:22 +02:00
Jonas Hendrickx
270a83cbfa
Merge branch 'main' into PM-16921
# Conflicts:
#	src/Api/Auth/Controllers/AccountsController.cs
#	src/Core/Services/Implementations/StripePaymentService.cs
2025-04-09 10:57:57 +02:00
Jonas Hendrickx
8d4c3d83b2
Not updating automatic tax flag correctly when removing VAT number (#5608) 2025-04-08 21:54:52 +02:00
Jared McCannon
dcd62f00ba
[PM-15420] Managed to Claimed (#5594)
* Renamed ManagedUserDomainClaimedEmails to ClaimedUserDomainClaimedEmails

* Renamed method to improve clarity and consistency.

Replaced `ValidateManagedUserDomainAsync` with `ValidateClaimedUserDomainAsync`.

* Rename `GetOrganizationsManagingUserAsync` to `GetOrganizationsClaimingUserAsync`.

This renaming clarifies the function's purpose, aligning its name with the concept of "claiming" rather than "managing" user associations.

* Refactor variable naming in ValidateClaimedUserDomainAsync

* Managed to claimed

* Managed to claimed

* Managed to claimed

* Managing to Claiming

* Managing to Claiming

* Managing to Claiming

* Managing to Claiming

* Renamed DeleteManagedOrganizationUserAccountCommand to DeleteClaimedOrganizationUserAccountCommand

* Renamed IDeleteManagedOrganizationUserAccountCommand to IDeleteClaimedOrganizationUserAccountCommand

* Updated variable name

* IsManagedBy to IsClaimedBy

* Created new property. obsoleted old property and wired up for backward compatibility.

* More Managed to Claimed renames.

* Managed to Claimed

* Fixing tests... 🤦

* Got the rest of em

* missed the test 🤦

* fixed test.
2025-04-08 14:38:44 -05:00
Shane Melton
f5f8d37d72
[PM-18858] Use int.TryParse for plurality helper (#5625) 2025-04-08 11:13:47 -07:00
Justin Baur
f29b5c531f
Include Root Certificates in Custom Trust Store (#5624)
* Add new tests

* Include root CA's in custom trust store
2025-04-08 13:36:34 -04:00
Rui Tomé
65f382ee67
[PM-17616] Remove feature flag for PushSyncOrgKeysOnRevokeRestore (#5616) 2025-04-08 15:26:00 +01:00
Bernd Schoolmann
f732db4d2d
Add xchacha20poly1305 enc type (#5470) 2025-04-08 12:33:44 +02:00
Todd Martin
8beefbb417
[PM-19685] Remove email delay feature flag (#5622)
* Remove email delay feature flag

* Fixed reference.

* Removed field from old registration method
2025-04-07 21:36:08 -04:00
Jimmy Vo
91fa02f8e6
[PM-19811] fix ResetPasswordEnrolled check to handle empty and whitespace strings. (#5599) 2025-04-07 17:15:01 -04:00
Justin Baur
a8403f3dc2
[PM-19601] Introduce options for adding certificates to trust without root (#5609)
* Introduce options for adding certificates to the X509ChainPolicy.CustomTrustStore

Co-authored-by: tangowithfoxtrot <tangowithfoxtrot@users.noreply.github.com>

* Add comments

* Fix places I am still calling it TLS options

* Format

* Format from root

* Add more tests

* Add HTTP Tests

* Format

* Switch to empty builder

* Remove unneeded helper

* Configure logging only once

---------

Co-authored-by: tangowithfoxtrot <tangowithfoxtrot@users.noreply.github.com>
2025-04-07 14:10:36 -04:00
Graham Walker
1cf9ff34c1
PM-17921 change the GenerateAccessData method to process lists in parallel (#5552)
* PM-17921 change the GenerateAccessData method to process lists in parallel.

* PM-17921 removing old method
2025-04-07 11:26:06 -05:00
bnagawiecki
01daad5942
add feature flag for new desktop cipher forms (#5621) 2025-04-07 10:48:50 -04:00
Rui Tomé
56915ec322
[PM-17474] Remove unused feature flag for device approval request admin notifications (#5615) 2025-04-07 15:22:09 +01:00
Matt Bishop
7139effa94
Organization integration database / repository logic (#5602)
* Organization integration creation, update, and deletion database logic

* Additional procs and entity tweaks

* Use check

* Couple newlines

* Forgot to script the two org procs
2025-04-07 07:20:18 -07:00
Jared McCannon
0d7363c6af
[PM-16811] - SCIM Invite Users Optimizations (#5398)
* WIP changes for Invite User optimization from Scim

* feature flag string

* Added plan validation to PasswordManagerInviteUserValidation. Cleaned up a few things.

* Added Secrets Manager Validations and Tests.

* Added bulk procedure for saving users, collections and groups from inviting. Added test to validate Ef and Sproc

* Created SendOrganizationInvitesCommand and moved some tests from OrgServiceTests. Fixed some tests in org service in relation to moving out SendOrgInviteCommand code.

Added side effects to InviteOrganizationUsersCommand

* First test of new command.

* Added test to verify valid request with a user calls db method and sends the invite

* Added more tests for the updates

* Added integration test around enabling feature and sending invite via scim. Did a bit of refactoring on the SM validation. Fixed couple bugs found.

* Switching over to a local factory.

* created response model and split interface out.

* switched to initialization block

* Moved to private method. Made ScimInvite inherit the single invite base model. Moved create methods to constructors. A few more CR changes included.

* Moved `FromOrganization` mapper method to a constructor

* Updated to use new pricing client. Supressed null dereference errors.

* Fixing bad merge.

* Rename of OrgDto

* undoing this

* Moved into class

* turned into a switch statement

* Separated into separate files.

* Renamed dto and added ctor

* Dto rename. Moved from static methods to ctors

* Removed unused request model

* changes from main

* missed value

* Fixed some compilation errors.

* Fixed some changes.

* Removed comment

* fixed compiler warning.

* Refactored to use new ValidationResult pattern. added mapping method.

* Added throwing of Failure as the previous implementation would have.

* Cleaned up return.

* fixing test.

* Made HasSecretsManagerStandalone return if org doesn't have sm. Added overload for lighter weight model and moved common code to private method.

* Fixed tests.

* Made public method private. added some comments.

* Refactor validation parameter to improve clarity and consistency. Added XML doc

* fixed test

* Removed test only constructor from InviteOrganization

* Separated old and new code explicitly. Moved old code checks down into new code as well. Added error and mapper to Failure<T>

* Variable/Field/Property renames

* Renamed InviteUsersValidation to InviteUsersValidator

* Rename for InvitingUserOrganizationValidation to InvitingUserOrganizationValidator

* PasswordManagerInviteUserValidation to PasswordManagerInviteUserValidator

* Moved XML comment. Added check to see if additional seats are needed.

* Fixing name.

* Updated names.

* Corrected double negation.

* Added groups and collection and users checks.

* Fixed comment. Fixed multiple enumeration. Changed variable name.

* Cleaned up DTO models. Moved some validation steps around. A few quick fixes to address CR concerns. Still need to move a few things yet.

* Fixed naming in subscription update models.

* put back in the request for now.

* Quick rename

* Added provider email addresses as well.

* Removed valid wrapper to pass in to validation methods.

* fix tests

* Code Review changes.

* Removed unused classes

* Using GetPlanOrThrow instead.

* Switches to extension method

* Made Revert and Adjust Sm methods consistent. Corrected string comparer. Added comment for revert sm.

* Fixing compiler complaint.

* Adding XML docs

* Calculated seat addition for SM.

* Fixing compiler complaints.

* Renames for organization.

* Fixing comparison issue.

* Adding error and aligning message.

* fixing name of method.

* Made extension method.

* Rearranged some things. Fixed the tests.

* Added test around validating the revert.

* Added test to validate the provider email is sent if org is managed by a provider.

* Created new errors and removed references in business code to ErrorMessages property. This aligns Invite User code to use Errors instead of ErrorMessages

* Delayed the hasSecretsManagerStandalone call as long as possible.

* Corrected model name. Corrected SM seat calculation. Added test for it.

* Corrected logic and added more tests.
2025-04-07 09:14:10 -05:00
Alex Morask
3c56866a76
Expand tax_ids to avoid thrown tax exception (#5617) 2025-04-07 10:05:49 -04:00
Bernd Schoolmann
7c76eddee5
[PM-19801] Clear device keys on deactivate (#5592)
* Clear device keys on deactivate

* Fix migration

* Add newline

* Remove inactive device migration
2025-04-07 14:35:27 +02:00
Github Actions
1c6bac9dd5 Bumped version to 2025.4.1 2025-04-07 10:59:53 +00:00
cyprain-okeke
e53e701097
Initial commit (#5612) 2025-04-07 11:32:38 +01:00
Shane Melton
0bad7a6e5f
[PM-10611] Add missing TaskId to push notification payloads (#5604)
* [PM-10611] Add missing TaskId to push notification payloads

* [PM-10611] Fix test
2025-04-04 13:43:11 -07:00
Andy Pixley
39ac93326d
[BRE-457] Updating CODEOWNERS for self-host ownership (#5593) 2025-04-04 09:53:12 -04:00
Rui Tomé
e176e6e06e
[PM-17615] Refactor OrganizationService to remove feature flag check for PushSyncOrgKeysOnRevokeRestore (#5547)
* Refactor OrganizationService to remove feature flag check for PushSyncOrgKeysOnRevokeRestore

* Remove redundant tests

* Remove unused IFeatureService dependency from RestoreOrganizationUserCommand class
2025-04-04 14:52:57 +01:00
Jonas Hendrickx
67d7d685a6
[PM-19048] Replace AddMvc with AddControllers (#5481) 2025-04-04 09:11:00 +02:00
Justin Baur
559101d7e2
Add SMTP Mail Tests (#5597)
* Add SMTP Mail Tests

Co-authored-by: tangowithfoxtrot <5676771+tangowithfoxtrot@users.noreply.github.com>

* Update test/Core.IntegrationTest/MailKitSmtpMailDeliveryServiceTests.cs

* Add Skipped Tests for upcoming feature

* Safer TCS Completion

---------

Co-authored-by: tangowithfoxtrot <5676771+tangowithfoxtrot@users.noreply.github.com>
2025-04-03 12:59:19 -04:00
Jake Fink
83e06c9241
[PM-19523] Filter expected webauthn keys for rotations by prf enabled (#5566)
* filter expected webauthn keys for rotations by prf enabled

* fix and add tests

* format
2025-04-03 11:57:51 -04:00
Jimmy Vo
38ae5ff885
[PM-19588] Ensure custom users cannot delete or remove admins. (#5590) 2025-04-03 11:35:09 -04:00
Brant DeBow
33f5a19b99
[PM-17562] Add Dapper and EF Repositories For Ogranization Integrations and Configurations (#5589)
* [PM-17562] Add Dapper and EF Repositories For Ogranization Integrations and Configurations

* Updated with changes from PR comments
2025-04-03 11:23:00 -04:00
Jared McCannon
60e9827196
Added more tests to catch more use cases and fix bugs. (#5598) 2025-04-03 10:03:31 -05:00
Vijay Oommen
0f0c3a4e5a
[PM-19423] Update an existing org with license should set UseRiskInsights flag (#5539) 2025-04-03 08:35:29 -05:00
Alex Morask
282e80ca02
[PM-13837] Switch provider price IDs (#5518)
* Add ProviderPriceAdapter

This is a temporary utility that will be used to manage retrieval of provider price IDs until all providers can be migrated to the new price structure.

* Updated ProviderBillingService.ChangePlan

* Update ProviderBillingService.SetupSubscription

* Update ProviderBillingService.UpdateSeatMinimums

* Update ProviderBillingService.CurrySeatScalingUpdate

* Mark StripeProviderPortalSeatPlanId obsolete

* Run dotnet format
2025-04-03 08:51:09 -04:00
Github Actions
1cc854ddb9 Bumped version to 2025.4.0 2025-04-03 12:35:46 +00:00
Bernd Schoolmann
8fd48374dc
[PM-2199] Implement userkey rotation for all TDE devices (#5446)
* Implement userkey rotation v2

* Update request models

* Cleanup

* Update tests

* Improve test

* Add tests

* Fix formatting

* Fix test

* Remove whitespace

* Fix namespace

* Enable nullable on models

* Fix build

* Add tests and enable nullable on masterpasswordunlockdatamodel

* Fix test

* Remove rollback

* Add tests

* Make masterpassword hint optional

* Update user query

* Add EF test

* Improve test

* Cleanup

* Set masterpassword hint

* Remove connection close

* Add tests for invalid kdf types

* Update test/Core.Test/KeyManagement/UserKey/RotateUserAccountKeysCommandTests.cs

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Fix formatting

* Update src/Api/KeyManagement/Models/Requests/RotateAccountKeysAndDataRequestModel.cs

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update src/Api/Auth/Models/Request/Accounts/MasterPasswordUnlockDataModel.cs

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update src/Api/Auth/Models/Request/Accounts/MasterPasswordUnlockDataModel.cs

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update src/Api/KeyManagement/Models/Requests/AccountKeysRequestModel.cs

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Fix imports

* Fix tests

* Add poc for tde rotation

* Improve rotation transaction safety

* Add validator tests

* Clean up validator

* Add newline

* Add devicekey unlock data to integration test

* Fix tests

* Fix tests

* Remove null check

* Remove null check

* Fix IsTrusted returning wrong result

* Add rollback

* Cleanup

* Address feedback

* Further renames

---------

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
2025-04-03 11:30:49 +02:00
Brandon Treston
0069866dea
override exempt status to include Invited (#5596) 2025-04-02 17:07:05 -04:00
Shane Melton
d4a3cd00be
[PM-17563] Add missing TaskId and HubHelper for PendingSecurityTasks (#5591)
* [PM-17563] Add case for PushType.PendingSecurityTasks

* [PM-17563] Add missing TaskId property to NotificationStatusDetails and NotificationResponseModel

* [PM-17563] Add migration script to re-create NotificationStatusDetailsView to include TaskId column

* [PM-17563] Select explicit columns for NotificationStatusDetailsView and fix migration script
2025-04-02 13:44:59 -07:00
Nick Krantz
7b2b62e794
[PM-18858] Security Task email plurality (#5588)
* use handlebars helper for plurality of text rather than logic within the template

* Remove `TaskCountPlural` - unused
2025-04-02 13:18:53 -07:00
Jimmy Vo
aef05f5fb6
[PM-19290] Skip the notification step if no admin emails are available. (#5582) 2025-04-02 15:23:31 -04:00
Jonas Hendrickx
b309de141d
[PM-19147] Automatic Tax Improvements (#5545)
* Pm 19147 2 (#5544)

* Pm 19147 2 (#5544)

* Unit tests for tax strategies `GetUpdateOptions`

* Only allow automatic tax flag to be updated for complete subscription updates such as plan changes, not when upgrading additional storage, seats, etc

* unit tests for factory

* Fix build

* Automatic tax for tax estimation

* Fix stub

* Fix stub

* "customer.tax_ids" isn't expanded in some flows.

* Fix SubscriberServiceTests.cs

* BusinessUseAutomaticTaxStrategy > SetUpdateOptions tests

* Fix ProviderBillingServiceTests.cs
2025-04-02 13:47:48 -04:00
Rui Tomé
10ea2cb3eb
[PM-17473] Refactor AuthRequestService to remove admin notification feature flag (#5549) 2025-04-02 11:47:44 +01:00
Rui Tomé
abe593d221
[PM-18088] Implement LimitItemDeletion permission checks for all cipher operations (#5476)
* Implement enhanced cipher deletion and restore permissions with feature flag support

- Add new method `CanDeleteOrRestoreCipherAsAdminAsync` in CiphersController
- Update NormalCipherPermissions to support more flexible cipher type checking
- Modify CipherService to use new permission checks with feature flag
- Refactor test methods to support new permission logic
- Improve authorization checks for organization cipher management

* Refactor cipher methods to use CipherDetails and simplify type handling

- Update CiphersController to use GetByIdAsync with userId
- Modify NormalCipherPermissions to remove unnecessary type casting
- Update ICipherService and CipherService method signatures to use CipherDetails
- Remove redundant type checking in CipherService methods
- Improve type consistency in cipher-related operations

* Enhance CiphersControllerTests with detailed permission and feature flag scenarios

- Add test methods for DeleteAdmin with edit and manage permission checks
- Implement tests for LimitItemDeletion feature flag scenarios
- Update test method names to reflect more precise permission conditions
- Improve test coverage for admin cipher deletion with granular permission handling

* Add comprehensive test coverage for admin cipher restore operations

- Implement test methods for PutRestoreAdmin and PutRestoreManyAdmin
- Add scenarios for owner and admin roles with LimitItemDeletion feature flag
- Cover permission checks for manage and edit permissions
- Enhance test coverage for single and bulk cipher restore admin operations
- Verify correct invocation of RestoreAsync and RestoreManyAsync methods

* Refactor CiphersControllerTests to remove redundant assertions and mocking

- Remove unnecessary assertions for null checks
- Simplify mocking setup for cipher repository and service methods
- Clean up redundant type and data setup in test methods
- Improve test method clarity by removing extraneous code

* Add comprehensive test coverage for cipher restore, delete, and soft delete operations

- Implement test methods for RestoreAsync with org admin override and LimitItemDeletion feature flag
- Add scenarios for checking manage and edit permissions during restore operations
- Extend test coverage for DeleteAsync with similar permission and feature flag checks
- Enhance SoftDeleteAsync tests with org admin override and permission validation
- Improve test method names to reflect precise permission conditions

* Add comprehensive test coverage for cipher restore, delete, and soft delete operations

- Extend test methods for RestoreManyAsync with various permission scenarios
- Add test coverage for personal and organization ciphers in restore operations
- Implement tests for RestoreManyAsync with LimitItemDeletion feature flag
- Add detailed test scenarios for delete and soft delete operations
- Improve test method names to reflect precise permission and feature flag conditions

* Refactor authorization checks in CiphersController to use All() method for improved readability

* Refactor filtering of ciphers in CipherService to streamline organization ability checks and improve readability
2025-04-02 10:52:23 +01:00
Jimmy Vo
f90bcd44de
[PM-19575] Allow enabling Single Org policy when the organization has claimed domains. (#5565) 2025-04-01 10:28:57 -04:00
Vijay Oommen
fd781415c4
[PM-19222] Include UseRiskInsights in license file (#5528) 2025-04-01 16:19:42 +02:00
Todd Martin
1beb5dc5c0
Separate desktop and CLI for ClientType checks (#5441) 2025-04-01 10:06:30 -04:00
Conner Turnbull
0ca1b319fd
Fix PayPal to Stripe credit truncation bug (#5561) 2025-03-31 15:20:31 -04:00
Nick Krantz
9c16127bd4
[PM-14406] Fix security task email sends (#5571)
* convert `AdminOwnerEmails` to List rather than IEnumerable

* check for JSON array in `formatAdminOwnerEmails`

* remove trailing comma for admin/owners

* Use display block on tables to enforce padding

* update padding around review at-risk passwords
2025-03-31 14:00:43 -05:00
Todd Martin
0579fb0e68
[PM-9115] Add feature flag for 2FA persistence (#5583)
* Add new feature flag.

* Clarified name.
2025-03-31 14:27:09 -04:00
renovate[bot]
e7abb07d19
[deps] Tools: Update LaunchDarkly.ServerSdk to 8.7.0 (#5581)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
2025-03-31 16:35:59 +00:00
renovate[bot]
a879e4722c
[deps] Tools: Update aws-sdk-net monorepo (#5580)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
2025-03-31 16:33:50 +00:00
Conner Turnbull
30ad7d3f73
[PM-18564] Added policy validation before creating or sending org sponsorship invite (#5459)
* Added policy validation before creating or sending org sponsorship invite

* dotnet format strikes again
2025-03-31 12:25:41 -04:00
Jared Snider
683ade9ffc
feat(EF WebAuthnCreds Repo): [Auth/PM-19629] EF WebAuthnCredentialRepository.cs - Rewrite query to avoid reading entire table into memory (#5567) 2025-03-31 09:49:14 -04:00