Only org policy

bitwarden_license/src/Portal/Models/PolicyEditModel.cs

@@ -81,6 +81,9 @@ public Policy ToPolicy(Policy existingPolicy)
                 case PolicyType.PasswordGenerator:
                     existingPolicy.Data = JsonSerializer.Serialize(PasswordGeneratorDataModel, options);
                     break;
+                case PolicyType.OnlyOrg: 
+                case PolicyType.TwoFactorAuthentication:
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }

bitwarden_license/src/Portal/Models/PolicyModel.cs

@@ -32,6 +32,11 @@ public PolicyModel(PolicyType policyType, bool enabled)
                     DescriptionKey = "PasswordGeneratorDescription";
                     break;
 
+                case PolicyType.OnlyOrg:
+                    NameKey = "OnlyOrganization";
+                    DescriptionKey = "OnlyOrganizationDescription";
+                    break;
+
                 default:
                     throw new ArgumentOutOfRangeException();
             }

bitwarden_license/src/Portal/Views/Policies/Edit.cshtml

@@ -22,6 +22,17 @@
         </div>
     }
 
+    @if (Model.PolicyType == PolicyType.OnlyOrg)
+    {
+        <div class="callout callout-warning" role="alert">
+            <h3 class="callout-heading">
+                <i class="fa fa-warning" *ngIf="icon" aria-hidden="true"></i>
+                @i18nService.T("Warning")
+            </h3>
+            @i18nService.T("OnlyOrganizationPolicyWarning")
+        </div>
+    }
+
     <div class="form-group">
         <div class="form-check">
             <input class="form-check-input" type="checkbox" asp-for="Enabled">

src/Api/Controllers/OrganizationsController.cs

@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
+using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
@@ -25,6 +26,7 @@ public class OrganizationsController : Controller
         private readonly IPaymentService _paymentService;
         private readonly CurrentContext _currentContext;
         private readonly GlobalSettings _globalSettings;
+        private readonly IPolicyRepository _policyRepository;
 
         public OrganizationsController(
             IOrganizationRepository organizationRepository,
@@ -33,7 +35,8 @@ public OrganizationsController(
             IUserService userService,
             IPaymentService paymentService,
             CurrentContext currentContext,
-            GlobalSettings globalSettings)
+            GlobalSettings globalSettings,
+            IPolicyRepository policyRepository)
         {
             _organizationRepository = organizationRepository;
             _organizationUserRepository = organizationUserRepository;
@@ -42,6 +45,7 @@ public OrganizationsController(
             _paymentService = paymentService;
             _currentContext = currentContext;
             _globalSettings = globalSettings;
+            _policyRepository = policyRepository;
         }
 
         [HttpGet("{id}")]
@@ -156,6 +160,13 @@ public async Task<OrganizationResponseModel> Post([FromBody]OrganizationCreateRe
                 throw new Exception("Invalid plan selected.");
             }
 
+            var policies = await _policyRepository.GetManyByUserIdAsync(user.Id);
+            if (policies.Any(policy => policy.Type == PolicyType.OnlyOrg))
+            {
+                throw new Exception("You may not create an organization. You belong to an organization " +
+                     "which has a policy that prohibits you from being a member of any other organization.");
+            }
+
             var organizationSignup = model.ToOrganizationSignup(user);
             var result = await _organizationService.SignUpAsync(organizationSignup);
             return new OrganizationResponseModel(result.Item1);
@@ -177,6 +188,13 @@ public async Task<OrganizationResponseModel> PostLicense(OrganizationCreateLicen
                 throw new BadRequestException("Invalid license");
             }
 
+            var policies = await _policyRepository.GetManyByUserIdAsync(user.Id);
+            if (policies.Any(policy => policy.Type == PolicyType.OnlyOrg))
+            {
+                throw new Exception("You may not create an organization. You belong to an organization " +
+                     "which has a policy that prohibits you from being a member of any other organization.");
+            }
+
             var result = await _organizationService.SignUpAsync(license, user, model.Key, model.CollectionName);
             return new OrganizationResponseModel(result.Item1);
         }

src/Core/Enums/PolicyType.cs

@@ -4,6 +4,7 @@ public enum PolicyType : byte
     {
         TwoFactorAuthentication = 0,
         MasterPassword = 1,
-        PasswordGenerator = 2
+        PasswordGenerator = 2,
+        OnlyOrg = 3,
     }
 }

src/Core/MailTemplates/Handlebars/OrganizationUserRemovedForPolicyOnlyOrg.html.hbs

@@ -0,0 +1,9 @@
+{{#>FullHtmlLayout}}
+<table width="100%" cellpadding="0" cellspacing="0" style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+    <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+        <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top" align="left">
+            Your user account has been removed from the <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">{{OrganizationName}}</b> organization because you are a part of another organization. The {{OrganizationName}} organization has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations or join with a different account.
+        </td>
+    </tr>
+</table>
+{{/FullHtmlLayout}}

src/Core/MailTemplates/Handlebars/OrganizationUserRemovedForPolicyOnlyOrg.text.hbs

@@ -0,0 +1,5 @@
+{{#>BasicTextLayout}}
+Your user account has been removed from the {{OrganizationName}} organization because you are a part of another
+organization. The {{OrganizationName}} has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations, or join with a
+new account.
+{{/BasicTextLayout}}

src/Core/Models/Mail/OrganizationUserRemovedForPolicyOnlyOrgViewModel.cs

@@ -0,0 +1,7 @@
+namespace Bit.Core.Models.Mail
+{
+    public class OrganizationUserRemovedForPolicyOnlyOrgViewModel : BaseMailModel
+    {
+        public string OrganizationName { get; set; }
+    }
+}

src/Core/Resources/SharedResources.en.resx

@@ -539,4 +539,13 @@
   <data name="RedirectBehavior" xml:space="preserve">
     <value>OIDC Redirect Behavior</value>
   </data>
+  <data name="OnlyOrganization" xml:space="preserve">
+    <value>Only Organization</value>
+  </data>
+  <data name="OnlyOrganizationDescription" xml:space="preserve">
+    <value>Restrict users from being able to join any other organizations.</value>
+  </data>
+  <data name="OnlyOrganizationPolicyWarning" xml:space="preserve">
+    <value>Organization members who are already a part of another organization will be removed from this organization and will receive an email notifying them about the change.</value>
+  </data>
 </root>

src/Core/Services/IMailService.cs

@@ -28,5 +28,6 @@ Task SendInvoiceUpcomingAsync(string email, decimal amount, DateTime dueDate, Li
         Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null);
         Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip);
         Task SendRecoverTwoFactorEmail(string email, DateTime timestamp, string ip);
+        Task SendOrganizationUserRemovedForPolicyOnlyOrgEmailAsync(string organizationName, string email);
     }
 }

src/Core/Services/Implementations/HandlebarsMailService.cs

@@ -326,6 +326,20 @@ public async Task SendRecoverTwoFactorEmail(string email, DateTime timestamp, st
             await _mailDeliveryService.SendEmailAsync(message);
         }
 
+        public async Task SendOrganizationUserRemovedForPolicyOnlyOrgEmailAsync(string organizationName, string email)
+        {
+            var message = CreateDefaultMessage($"You have been removed from {organizationName}", email);
+            var model = new OrganizationUserRemovedForPolicyOnlyOrgViewModel
+            {
+                OrganizationName = CoreHelpers.SanitizeForEmail(organizationName),
+                WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
+                SiteName = _globalSettings.SiteName
+            };
+            await AddMessageContentAsync(message, "OrganizationUserRemovedForPolicyOnlyOrg", model);
+            message.Category = "OrganizationUserRemovedForPolicyOnlyOrg";
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
         private MailMessage CreateDefaultMessage(string subject, string toEmail)
         {
             return CreateDefaultMessage(subject, new List<string> { toEmail });

src/Core/Services/Implementations/OrganizationService.cs

@@ -1110,10 +1110,48 @@ public async Task<OrganizationUser> AcceptUserAsync(Guid organizationUserId, Use
                 throw new BadRequestException("Invalid token.");
             }
 
+            ICollection<Policy> orgPolicies = null;
+            ICollection<Policy> userPolicies = null;
+            async Task<bool> hasPolicyAsync(PolicyType policyType, bool useUserPolicies = false)
+            {
+                ICollection<Policy> policies = null;
+                if (useUserPolicies) 
+                {
+                    if (userPolicies == null)
+                    {
+                        userPolicies = await _policyRepository.GetManyByUserIdAsync(user.Id);
+                    }
+                    policies = userPolicies;
+                } 
+                else
+                {
+                    if (orgPolicies == null)
+                    {
+                        orgPolicies = await _policyRepository.GetManyByOrganizationIdAsync(orgUser.OrganizationId);
+                    }
+                    policies = orgPolicies;
+                }
+
+                return policies.Any(p => p.Type == policyType && p.Enabled);
+            }
+            var userOrgs = await _organizationUserRepository.GetManyByUserAsync(user.Id);
+            if (userOrgs.Any(ou => ou.OrganizationId != orgUser.OrganizationId && ou.Status != OrganizationUserStatusType.Invited))
+            {   
+                if (await hasPolicyAsync(PolicyType.OnlyOrg))
+                {
+                    throw new BadRequestException("You may not join this organization until you leave or remove " +
+                        "all other organizations.");
+                }
+                if (await hasPolicyAsync(PolicyType.OnlyOrg, true))
+                {
+                    throw new BadRequestException("You cannot join this organization because you are a member of " + 
+                        "an organization which forbids it");
+                }
+            }
+
             if (!await userService.TwoFactorIsEnabledAsync(user))
             {
-                var policies = await _policyRepository.GetManyByOrganizationIdAsync(orgUser.OrganizationId);
-                if (policies.Any(p => p.Type == PolicyType.TwoFactorAuthentication && p.Enabled))
+                if (await hasPolicyAsync(PolicyType.TwoFactorAuthentication))
                 {
                     throw new BadRequestException("You cannot join this organization until you enable " +
                         "two-step login on your user account.");
@@ -1160,6 +1198,16 @@ public async Task<OrganizationUser> ConfirmUserAsync(Guid organizationId, Guid o
                 throw new BadRequestException("User does not have two-step login enabled.");
             }
 
+            var usingOnlyOrgPolicy = policies.Any(p => p.Type == PolicyType.OnlyOrg && p.Enabled);
+            if (usingOnlyOrgPolicy)
+            {
+                var userOrgs = await _organizationUserRepository.GetManyByUserAsync(user.Id);
+                if (userOrgs.Any(ou => ou.OrganizationId != organizationId && ou.Status != OrganizationUserStatusType.Invited))
+                {
+                    throw new BadRequestException("User is a member of another organization.");
+                }
+            }
+
             orgUser.Status = OrganizationUserStatusType.Confirmed;
             orgUser.Key = key;
             orgUser.Email = null;

src/Core/Services/Implementations/PolicyService.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
@@ -53,25 +55,52 @@ public async Task SaveAsync(Policy policy, IUserService userService, IOrganizati
                 var currentPolicy = await _policyRepository.GetByIdAsync(policy.Id);
                 if (!currentPolicy?.Enabled ?? true)
                 {
-                    if (currentPolicy.Type == Enums.PolicyType.TwoFactorAuthentication)
+                    var kickableOffenses = new List<Enums.PolicyType> {
+                        Enums.PolicyType.TwoFactorAuthentication,
+                        Enums.PolicyType.OnlyOrg
+                    };
+
+                    if (kickableOffenses.Contains(currentPolicy.Type))
                     {
                         Organization organization = null;
                         var orgUsers = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(
                             policy.OrganizationId);
                         foreach (var orgUser in orgUsers.Where(ou =>
                             ou.Status != Enums.OrganizationUserStatusType.Invited &&
-                            ou.Type != Enums.OrganizationUserType.Owner))
+                            ou.Type != Enums.OrganizationUserType.Owner && ou.UserId != savingUserId))
                         {
-                            if (orgUser.UserId != savingUserId && !await userService.TwoFactorIsEnabledAsync(orgUser))
+                            switch (currentPolicy.Type)
                             {
-                                if (organization == null)
-                                {
-                                    organization = await _organizationRepository.GetByIdAsync(policy.OrganizationId);
-                                }
-                                await organizationService.DeleteUserAsync(policy.OrganizationId, orgUser.Id,
-                                    savingUserId);
-                                await _mailService.SendOrganizationUserRemovedForPolicyTwoStepEmailAsync(
-                                    organization.Name, orgUser.Email);
+                                case Enums.PolicyType.TwoFactorAuthentication:
+                                    if (!await userService.TwoFactorIsEnabledAsync(orgUser))
+                                    {
+                                        if (organization == null)
+                                        {
+                                            organization = await _organizationRepository.GetByIdAsync(policy.OrganizationId);
+                                        }
+                                        await organizationService.DeleteUserAsync(policy.OrganizationId, orgUser.Id,
+                                            savingUserId);
+                                        await _mailService.SendOrganizationUserRemovedForPolicyTwoStepEmailAsync(
+                                            organization.Name, orgUser.Email);
+                                    }
+                                    break;
+                                case Enums.PolicyType.OnlyOrg:
+                                    if (orgUser.UserId.HasValue)
+                                    {
+                                        var userOrgs = await _organizationUserRepository.GetManyByUserAsync(orgUser.UserId.Value);
+                                        if (userOrgs.Any(ou => ou.Status != OrganizationUserStatusType.Invited))
+                                        {
+                                            if (organization == null)
+                                            {
+                                                organization = await _organizationRepository.GetByIdAsync(policy.OrganizationId);
+                                            }
+                                            await organizationService.DeleteUserAsync(policy.OrganizationId, orgUser.Id,
+                                                savingUserId);
+                                            await _mailService.SendOrganizationUserRemovedForPolicyOnlyOrgEmailAsync(
+                                                organization.Name, orgUser.Email);
+                                        }
+                                    }
+                                break;
                             }
                         }
                     }

src/Core/Services/NoopImplementations/NoopMailService.cs

@@ -102,5 +102,10 @@ public Task SendRecoverTwoFactorEmail(string email, DateTime timestamp, string i
         {
             return Task.FromResult(0);
         }
+
+        public Task SendOrganizationUserRemovedForPolicyOnlyOrgEmailAsync(string organizationName, string email)
+        {
+            return Task.FromResult(0);
+        }
     }
 }