Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Code Issues Projects Releases Wiki Activity

only allow license key one use per installation

Browse Source
This commit is contained in:
Kyle Spearrin 2017-11-06 08:12:36 -05:00
parent 50a4202739
commit dccdef6db5
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Core/Services/Implementations/LicensingService.cs
View File

@ -62,25 +62,35 @@ namespace Bit.Core.Services
return;
}
var orgs = await _organizationRepository.GetManyByEnabledAsync();
_logger.LogInformation("Validating licenses for {0} organizations.", orgs.Count);
var enabledOrgs = await _organizationRepository.GetManyByEnabledAsync();
_logger.LogInformation("Validating licenses for {0} organizations.", enabledOrgs.Count);
foreach(var org in orgs)
foreach(var org in enabledOrgs)
{
var license = ReadOrganiztionLicense(org);
if(license == null || !license.VerifyData(org, _globalSettings) || !license.VerifySignature(_certificate))
if(license == null)
{
_logger.LogInformation("Organization {0}({1}) has an invalid license and is being disabled.",
org.Id, org.Name);
await DisableOrganizationAsync(org, null);
continue;
}
org.Enabled = false;
org.ExpirationDate = license.Expires;
org.RevisionDate = DateTime.UtcNow;
await _organizationRepository.ReplaceAsync(org);
var totalLicensedOrgs = enabledOrgs.Count(o => o.LicenseKey.Equals(license.LicenseKey));
if(totalLicensedOrgs > 1 || !license.VerifyData(org, _globalSettings) || !license.VerifySignature(_certificate))
{
await DisableOrganizationAsync(org, license);
}
}
}
private async Task DisableOrganizationAsync(Organization org, ILicense license)
{
_logger.LogInformation("Organization {0}({1}) has an invalid license and is being disabled.", org.Id, org.Name);
org.Enabled = false;
org.ExpirationDate = license?.Expires ?? DateTime.UtcNow;
org.RevisionDate = DateTime.UtcNow;
await _organizationRepository.ReplaceAsync(org);
}
public async Task ValidateUsersAsync()
{
if(!_globalSettings.SelfHosted)
@ -178,7 +188,7 @@ namespace Bit.Core.Services
user.Id, user.Email);
user.Premium = false;
user.PremiumExpirationDate = license.Expires;
user.PremiumExpirationDate = license?.Expires ?? DateTime.UtcNow;
user.RevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
}

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

@ -555,12 +555,18 @@ namespace Bit.Core.Services
"hosting of organizations and that the installation id matches your current installation.");
}
if(license.PlanType != PlanType.Custom &&
if(license.PlanType != PlanType.Custom &&
StaticStore.Plans.FirstOrDefault(p => p.Type == license.PlanType && !p.Disabled) == null)
{
throw new BadRequestException("Plan not found.");
}
var enabledOrgs = await _organizationRepository.GetManyByEnabledAsync();
if(enabledOrgs.Any(o => o.LicenseKey.Equals(license.LicenseKey)))
{
throw new BadRequestException("License is already in use by another organization.");
}
var organization = new Organization
{
Name = license.Name,
@ -683,6 +689,12 @@ namespace Bit.Core.Services
"hosting of organizations and that the installation id matches your current installation.");
}
var enabledOrgs = await _organizationRepository.GetManyByEnabledAsync();
if(enabledOrgs.Any(o => o.LicenseKey.Equals(license.LicenseKey) && o.Id != organizationId))
{
throw new BadRequestException("License is already in use by another organization.");
}
if(license.Seats.HasValue && (!organization.Seats.HasValue || organization.Seats.Value > license.Seats.Value))
{
var userCount = await _organizationUserRepository.GetCountByOrganizationIdAsync(organization.Id);