nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-12 05:13:58 -05:00
Code Activity

use policies property for orgs

Browse Source
This commit is contained in:
Kyle Spearrin
2020-01-15 15:00:54 -05:00
parent 58faf5266b
commit e8054df5b4
14 changed files with 310 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -33,6 +33,7 @@ namespace Bit.Core.Services
private readonly IInstallationRepository _installationRepository;
private readonly IApplicationCacheService _applicationCacheService;
private readonly IPaymentService _paymentService;
private readonly IPolicyRepository _policyRepository;
private readonly GlobalSettings _globalSettings;
public OrganizationService(
@ -51,6 +52,7 @@ namespace Bit.Core.Services
IInstallationRepository installationRepository,
IApplicationCacheService applicationCacheService,
IPaymentService paymentService,
IPolicyRepository policyRepository,
GlobalSettings globalSettings)
{
_organizationRepository = organizationRepository;
@ -68,6 +70,7 @@ namespace Bit.Core.Services
_installationRepository = installationRepository;
_applicationCacheService = applicationCacheService;
_paymentService = paymentService;
_policyRepository = policyRepository;
_globalSettings = globalSettings;
}
@ -193,6 +196,16 @@ namespace Bit.Core.Services
}
}
if(!newPlan.UsePolicies && organization.UsePolicies)
{
var policies = await _policyRepository.GetManyByOrganizationIdAsync(organization.Id);
if(policies.Any(p => p.Enabled))
{
throw new BadRequestException($"Your new plan does not allow the policies feature. " +
$"Disable your policies.");
}
}
// TODO: Check storage?
string paymentIntentClientSecret = null;
@ -453,6 +466,7 @@ namespace Bit.Core.Services
MaxCollections = plan.MaxCollections,
MaxStorageGb = !plan.MaxStorageGb.HasValue ?
(short?)null : (short)(plan.MaxStorageGb.Value + signup.AdditionalStorageGb),
UsePolicies = plan.UsePolicies,
UseGroups = plan.UseGroups,
UseEvents = plan.UseEvents,
UseDirectory = plan.UseDirectory,
@ -524,6 +538,7 @@ namespace Bit.Core.Services
Seats = license.Seats,
MaxCollections = license.MaxCollections,
MaxStorageGb = _globalSettings.SelfHosted ? 10240 : license.MaxStorageGb, // 10 TB
UsePolicies = license.UsePolicies,
UseGroups = license.UseGroups,
UseDirectory = license.UseDirectory,
UseEvents = license.UseEvents,
@ -675,6 +690,16 @@ namespace Bit.Core.Services
}
}
if(!license.UsePolicies && organization.UsePolicies)
{
var policies = await _policyRepository.GetManyByOrganizationIdAsync(organization.Id);
if(policies.Any(p => p.Enabled))
{
throw new BadRequestException($"Your organization currently has {policies.Count} enabled " +
$"policies. Your new license does not allow for the use of policies. Disable all policies.");
}
}
var dir = $"{_globalSettings.LicenseDirectory}/organization";
Directory.CreateDirectory(dir);
System.IO.File.WriteAllText($"{dir}/{organization.Id}.json",