[AC-2489] Resolve SM Standalone issues with SCIM & Directory Connector #4011

amorask-bitwarden · 2024-04-23T20:02:06Z

Type of change

- [X] Bug fix
- [ ] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps)
- [ ] Other

Objective

When organization users were invited through SCIM or through a Directory Connector import, we weren't checking whether the organization was using an SM Standalone trial.

This PR makes that check and, if the organization is on SM Standalone, ensures each invite's AccessSecretsManager property is set to true.

Screen.Recording.2024-04-23.at.3.49.20.PM.mov

Screen.Recording.2024-04-23.at.3.56.31.PM.mov

codecov · 2024-04-23T20:11:39Z

Codecov Report

Attention: Patch coverage is 84.21053% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 38.31%. Comparing base (5012d56) to head (cedaae6).

Files	Patch %	Lines
...e/Services/Implementations/StripePaymentService.cs	57.14%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4011      +/-   ##
==========================================
+ Coverage   38.30%   38.31%   +0.01%     
==========================================
  Files        1195     1195              
  Lines       58223    58239      +16     
  Branches     5583     5585       +2     
==========================================
+ Hits        22302    22315      +13     
- Misses      34871    34873       +2     
- Partials     1050     1051       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

github-actions · 2024-04-23T20:53:46Z

Checkmarx One – Scan Summary & Details – 7d75c3e7-e6b7-4dd1-8627-869d3b15f2f8

New Issues

Issue	Source File / Package	Checkmarx Insight
CSRF	/src/Api/Controllers/CollectionsController.cs: 212	Attack Vector
CSRF	/src/Api/Controllers/CollectionsController.cs: 270	Attack Vector
CSRF	/src/Api/Controllers/CollectionsController.cs: 270	Attack Vector
CSRF	/src/Api/Controllers/CollectionsController.cs: 212	Attack Vector
Missing_HSTS_Header	/bitwarden_license/src/Sso/Startup.cs: 57	Attack Vector
Privacy_Violation	/src/Api/Vault/Controllers/CiphersController.cs: 919	Attack Vector
Log_Forging	/src/Api/Vault/Controllers/CiphersController.cs: 911	Attack Vector

Fixed Issues

Severity	Issue	Source File / Package
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 587
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 587
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 587
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 587
	CSRF	/src/Api/AdminConsole/Controllers/ProvidersController.cs: 141
	CSRF	/src/Admin/AdminConsole/Controllers/ProvidersController.cs: 309
	CSRF	/src/Api/AdminConsole/Controllers/GroupsController.cs: 145
	CSRF	/src/Api/AdminConsole/Controllers/GroupsController.cs: 145
	CSRF	/src/Api/Billing/Controllers/ProviderClientsController.cs: 30
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 190
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 331
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 331
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 702
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 678
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 891
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 173
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 744
	CSRF	/src/Api/Vault/Controllers/FoldersController.cs: 45
	CSRF	/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs: 51
	CSRF	/src/Api/Controllers/UsersController.cs: 22
	CSRF	/src/Api/Controllers/DevicesController.cs: 70
	CSRF	/src/Api/Controllers/DevicesController.cs: 57
	CSRF	/src/Api/AdminConsole/Public/Controllers/PoliciesController.cs: 69
	CSRF	/src/Api/AdminConsole/Public/Controllers/PoliciesController.cs: 49
	CSRF	/src/Api/AdminConsole/Public/Controllers/OrganizationController.cs: 42
	CSRF	/src/Api/AdminConsole/Public/Controllers/GroupsController.cs: 92
	CSRF	/src/Api/AdminConsole/Public/Controllers/GroupsController.cs: 49
	CSRF	/src/Api/AdminConsole/Controllers/ProviderUsersController.cs: 142
	CSRF	/src/Api/AdminConsole/Controllers/ProviderOrganizationsController.cs: 52
	CSRF	/src/Api/AdminConsole/Controllers/PoliciesController.cs: 148
	CSRF	/src/Api/AdminConsole/Controllers/PoliciesController.cs: 78
	CSRF	/src/Api/AdminConsole/Controllers/PoliciesController.cs: 61
	CSRF	/bitwarden_license/src/Sso/Controllers/AccountController.cs: 163
	CSRF	/bitwarden_license/src/Sso/Controllers/AccountController.cs: 96
	CSRF	/bitwarden_license/src/Scim/Controllers/v2/UsersController.cs: 50
	CSRF	/src/Api/AdminConsole/Public/Controllers/GroupsController.cs: 161
	CSRF	/src/Api/Auth/Controllers/EmergencyAccessController.cs: 159
	CSRF	/bitwarden_license/src/Scim/Controllers/v2/GroupsController.cs: 98
	CSRF	/bitwarden_license/src/Scim/Controllers/v2/GroupsController.cs: 88
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 288
	CSRF	/src/Api/Controllers/CollectionsController.cs: 375
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 284
	CSRF	/src/Api/AdminConsole/Public/Controllers/MembersController.cs: 187
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 159
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 362
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 222
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 702
	CSRF	/src/Api/Auth/Controllers/TwoFactorController.cs: 403
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 193
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 408
	CSRF	/src/Api/AdminConsole/Controllers/GroupsController.cs: 128
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 900
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 571
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 174
	CSRF	/src/Admin/AdminConsole/Controllers/OrganizationsController.cs: 308
	CSRF	/src/Admin/AdminConsole/Controllers/ProvidersController.cs: 232
	CSRF	/src/Api/AdminConsole/Controllers/GroupsController.cs: 77
	CSRF	/src/Api/AdminConsole/Controllers/GroupsController.cs: 114
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 230
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 331
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 590
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 86
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 216
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 298
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 316
	CSRF	/src/Api/Controllers/CollectionsController.cs: 411
	CSRF	/src/Api/Controllers/CollectionsController.cs: 411
	CSRF	/src/Api/AdminConsole/Public/Controllers/MembersController.cs: 150
	CSRF	/src/Api/AdminConsole/Public/Controllers/MembersController.cs: 150
	CSRF	/src/Api/AdminConsole/Public/Controllers/GroupsController.cs: 133
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 586
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 590
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 590
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 590
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 433
	CSRF	/src/Api/AdminConsole/Controllers/ProviderUsersController.cs: 175
	CSRF	/src/Api/AdminConsole/Public/Controllers/OrganizationController.cs: 42
	CSRF	/src/Api/AdminConsole/Public/Controllers/OrganizationController.cs: 42
	CSRF	/src/Api/AdminConsole/Public/Controllers/OrganizationController.cs: 42
	CSRF	/src/Api/Controllers/CollectionsController.cs: 375
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 1023
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 1023
	CSRF	/src/Api/AdminConsole/Controllers/GroupsController.cs: 188
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 805
	CSRF	/src/Api/AdminConsole/Controllers/ProviderUsersController.cs: 188
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 791
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 144
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 550
	CSRF	/src/Api/Controllers/CollectionsController.cs: 303
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationsController.cs: 590
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 607
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 607
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 1046
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 1046
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 313
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 244
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 563
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 563
	CSRF	/src/Api/Controllers/SettingsController.cs: 36
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 438
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 284
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 728
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 1080
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 997
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 997
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 222
	CSRF	/src/Api/AdminConsole/Controllers/GroupsController.cs: 205
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 959
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 911
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 299
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 193
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 766
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 1100
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 550
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 613
	CSRF	/src/Api/Controllers/CollectionsController.cs: 303
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 878
	CSRF	/src/Api/Controllers/CollectionsController.cs: 323
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 244
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 222
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 807
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 942
	CSRF	/src/Api/Controllers/CollectionsController.cs: 187
	CSRF	/src/Api/AdminConsole/Public/Controllers/MembersController.cs: 127
	CSRF	/src/Api/Controllers/CollectionsController.cs: 156
	CSRF	/src/Identity/Controllers/AccountsController.cs: 72
	CSRF	/src/Identity/Controllers/AccountsController.cs: 50
	CSRF	/src/Api/Controllers/CollectionsController.cs: 196
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 125
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 111
	CSRF	/src/Api/Auth/Controllers/AccountsController.cs: 560
	CSRF	/src/Api/AdminConsole/Public/Controllers/MembersController.cs: 59
	CSRF	/src/Api/Tools/Controllers/ImportCiphersController.cs: 66
	CSRF	/src/Api/Tools/Controllers/ImportCiphersController.cs: 50
	CSRF	/src/Api/Public/Controllers/CollectionsController.cs: 64
	CSRF	/src/Admin/AdminConsole/Controllers/ProviderOrganizationsController.cs: 38
	CSRF	/src/Api/Auth/Controllers/WebAuthnController.cs: 130
	CSRF	/src/Api/Auth/Controllers/WebAuthnController.cs: 101
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 1100
	CSRF	/src/Api/Vault/Controllers/CiphersController.cs: 659
	CSRF	/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 117
	CSRF	/src/Api/AdminConsole/Controllers/GroupsController.cs: 89
	CSRF	/src/Api/Controllers/CollectionsController.cs: 375
	CSRF

More results are available on AST platform

r-tome

Nice work!

amorask-bitwarden added 3 commits April 23, 2024 11:23

Add auto-scale support to standalone SM for SCIM

ccfcc60

Mark users for SM when using SM Stadalone with Directory Connector

f1bc1a8

Merge branch 'main' into billing/AC-2489/sm-scim-dc

30bd9ee

amorask-bitwarden marked this pull request as ready for review April 23, 2024 20:02

amorask-bitwarden requested a review from a team as a code owner April 23, 2024 20:02

amorask-bitwarden requested a review from r-tome April 23, 2024 20:02

r-tome approved these changes Apr 24, 2024

View reviewed changes

Merge branch 'main' into billing/AC-2489/sm-scim-dc

cedaae6

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[AC-2489] Resolve SM Standalone issues with SCIM & Directory Connector #4011

[AC-2489] Resolve SM Standalone issues with SCIM & Directory Connector #4011

amorask-bitwarden commented Apr 23, 2024

codecov bot commented Apr 23, 2024 •

edited

github-actions bot commented Apr 23, 2024 •

edited

r-tome left a comment

[AC-2489] Resolve SM Standalone issues with SCIM & Directory Connector #4011

Are you sure you want to change the base?

[AC-2489] Resolve SM Standalone issues with SCIM & Directory Connector #4011

Conversation

amorask-bitwarden commented Apr 23, 2024

Type of change

Objective

codecov bot commented Apr 23, 2024 • edited

Codecov Report

github-actions bot commented Apr 23, 2024 • edited

New Issues

Fixed Issues

r-tome left a comment

Choose a reason for hiding this comment

codecov bot commented Apr 23, 2024 •

edited

github-actions bot commented Apr 23, 2024 •

edited