Skip to content

[AC-1638] Disallow Secrets Manager for MSP-managed organizations#3297

Merged
r-tome merged 12 commits intomasterfrom
ac/ac-1638/disallow-secrets-manager-for-msp-managed-organizations
Oct 12, 2023
Merged

[AC-1638] Disallow Secrets Manager for MSP-managed organizations#3297
r-tome merged 12 commits intomasterfrom
ac/ac-1638/disallow-secrets-manager-for-msp-managed-organizations

Conversation

@eliykat
Copy link
Copy Markdown
Member

@eliykat eliykat commented Sep 25, 2023

Type of change

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

Objective

We do not support MSP access to Secrets Manager, so we need to prevent:

  • an org with SM being added to an MSP, or
  • an MSP adding SM to one of their client organizations.

The internal Bitwarden Portal will not have this restriction, so that Customer Success can make case-by-case exceptions if required.

Clients changes: bitwarden/clients#6392

Code changes

  • ProviderService - block a provider from adding an existing org if it has SM
  • AddSecretsManagerSubscriptionCommand - block SM from being added to an existing org if it has an MSP
  • OrganizationService - block a provider from creating a new org with SM

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • If making database changes - make sure you also update Entity Framework queries and/or migrations
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team

@eliykat eliykat marked this pull request as draft September 25, 2023 04:31
@bitwarden-bot
Copy link
Copy Markdown

bitwarden-bot commented Sep 25, 2023

Logo
Checkmarx One – Scan Summary & Details89d10bc9-b299-4793-b500-838291add0b4

No New Or Fixed Issues Found

…-secrets-manager-for-msp-managed-organizations
@eliykat eliykat marked this pull request as ready for review October 4, 2023 04:50
@eliykat eliykat requested a review from a team October 4, 2023 04:50
@eliykat eliykat requested a review from a team as a code owner October 9, 2023 23:19
Copy link
Copy Markdown
Contributor

@amorask-bitwarden amorask-bitwarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Copy Markdown
Contributor

@cturnbull-bitwarden cturnbull-bitwarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@bitwarden-devops-bot bitwarden-devops-bot temporarily deployed to QA Cloud October 11, 2023 16:53 Inactive
@bitwarden-devops-bot bitwarden-devops-bot temporarily deployed to QA Cloud October 12, 2023 14:09 Inactive
@r-tome r-tome merged commit 53f5eee into master Oct 12, 2023
@r-tome r-tome deleted the ac/ac-1638/disallow-secrets-manager-for-msp-managed-organizations branch October 12, 2023 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants