diff --git a/src/Admin/Controllers/ToolsController.cs b/src/Admin/Controllers/ToolsController.cs index b1695e71bd..951d533e9b 100644 --- a/src/Admin/Controllers/ToolsController.cs +++ b/src/Admin/Controllers/ToolsController.cs @@ -1,13 +1,17 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text; using System.Threading.Tasks; using Bit.Admin.Models; using Bit.Core; +using Bit.Core.Models.Table; using Bit.Core.Repositories; +using Bit.Core.Services; using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; namespace Bit.Admin.Controllers { @@ -16,16 +20,28 @@ namespace Bit.Admin.Controllers public class ToolsController : Controller { private readonly GlobalSettings _globalSettings; + private readonly IOrganizationRepository _organizationRepository; + private readonly IOrganizationService _organizationService; + private readonly IUserService _userService; private readonly ITransactionRepository _transactionRepository; + private readonly IInstallationRepository _installationRepository; private readonly IOrganizationUserRepository _organizationUserRepository; public ToolsController( GlobalSettings globalSettings, + IOrganizationRepository organizationRepository, + IOrganizationService organizationService, + IUserService userService, ITransactionRepository transactionRepository, + IInstallationRepository installationRepository, IOrganizationUserRepository organizationUserRepository) { _globalSettings = globalSettings; + _organizationRepository = organizationRepository; + _organizationService = organizationService; + _userService = userService; _transactionRepository = transactionRepository; + _installationRepository = installationRepository; _organizationUserRepository = organizationUserRepository; } @@ -144,7 +160,7 @@ namespace Bit.Admin.Controllers public IActionResult PromoteAdmin() { - return View("PromoteAdmin"); + return View(); } [HttpPost] @@ -152,7 +168,7 @@ namespace Bit.Admin.Controllers { if (!ModelState.IsValid) { - return View("PromoteAdmin", model); + return View(model); } var orgUsers = await _organizationUserRepository.GetManyByOrganizationAsync( @@ -169,12 +185,84 @@ namespace Bit.Admin.Controllers if (!ModelState.IsValid) { - return View("PromoteAdmin", model); + return View(model); } user.Type = Core.Enums.OrganizationUserType.Owner; await _organizationUserRepository.ReplaceAsync(user); return RedirectToAction("Edit", "Organizations", new { id = model.OrganizationId.Value }); } + + public IActionResult GenerateLicense() + { + return View(); + } + + [HttpPost] + public async Task GenerateLicense(LicenseModel model) + { + if (!ModelState.IsValid) + { + return View(model); + } + + User user = null; + Organization organization = null; + if (model.UserId.HasValue) + { + user = await _userService.GetUserByIdAsync(model.UserId.Value); + if (user == null) + { + ModelState.AddModelError(nameof(model.UserId), "User Id not found."); + } + } + else if (model.OrganizationId.HasValue) + { + organization = await _organizationRepository.GetByIdAsync(model.OrganizationId.Value); + if (organization == null) + { + ModelState.AddModelError(nameof(model.OrganizationId), "Organization not found."); + } + else if (!organization.Enabled) + { + ModelState.AddModelError(nameof(model.OrganizationId), "Organization is disabled."); + } + } + if (model.InstallationId.HasValue) + { + var installation = await _installationRepository.GetByIdAsync(model.InstallationId.Value); + if (installation == null) + { + ModelState.AddModelError(nameof(model.InstallationId), "Installation not found."); + } + else if (!installation.Enabled) + { + ModelState.AddModelError(nameof(model.OrganizationId), "Installation is disabled."); + } + } + + if (!ModelState.IsValid) + { + return View(model); + } + + if (organization != null) + { + var license = await _organizationService.GenerateLicenseAsync(organization, + model.InstallationId.Value, model.Version); + return File(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(license, Formatting.Indented)), + "text/plain", "bitwarden_organization_license.json"); + } + else if (user != null) + { + var license = await _userService.GenerateLicenseAsync(user, null, model.Version); + return File(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(license, Formatting.Indented)), + "text/plain", "bitwarden_premium_license.json"); + } + else + { + throw new Exception("No license to generate."); + } + } } } diff --git a/src/Admin/Models/LicenseModel.cs b/src/Admin/Models/LicenseModel.cs new file mode 100644 index 0000000000..c8a598449f --- /dev/null +++ b/src/Admin/Models/LicenseModel.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; + +namespace Bit.Admin.Models +{ + public class LicenseModel : IValidatableObject + { + [Display(Name = "User Id")] + public Guid? UserId { get; set; } + [Display(Name = "Organization Id")] + public Guid? OrganizationId { get; set; } + [Display(Name = "Installation Id")] + public Guid? InstallationId { get; set; } + [Required] + [Display(Name = "Version")] + public int Version { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + if (UserId.HasValue && OrganizationId.HasValue) + { + yield return new ValidationResult("Use either User Id or Organization Id. Not both."); + } + + if (!UserId.HasValue && !OrganizationId.HasValue) + { + yield return new ValidationResult("User Id or Organization Id is required."); + } + + if (OrganizationId.HasValue && !InstallationId.HasValue) + { + yield return new ValidationResult("Installation Id is required for organization licenses."); + } + } + } +} diff --git a/src/Admin/Views/Shared/_Layout.cshtml b/src/Admin/Views/Shared/_Layout.cshtml index c88c444dfe..aaa4079ffb 100644 --- a/src/Admin/Views/Shared/_Layout.cshtml +++ b/src/Admin/Views/Shared/_Layout.cshtml @@ -55,6 +55,9 @@ Promote Admin + + Generate License +
  • diff --git a/src/Admin/Views/Tools/GenerateLicense.cshtml b/src/Admin/Views/Tools/GenerateLicense.cshtml new file mode 100644 index 0000000000..652ce3be0f --- /dev/null +++ b/src/Admin/Views/Tools/GenerateLicense.cshtml @@ -0,0 +1,39 @@ +@model LicenseModel +@{ + ViewData["Title"] = "Generate License File"; +} + +

    Generate License File

    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    + +
    \ No newline at end of file diff --git a/src/Core/Models/Business/OrganizationLicense.cs b/src/Core/Models/Business/OrganizationLicense.cs index af7e7f44fd..45efb6f60f 100644 --- a/src/Core/Models/Business/OrganizationLicense.cs +++ b/src/Core/Models/Business/OrganizationLicense.cs @@ -17,9 +17,9 @@ namespace Bit.Core.Models.Business { } public OrganizationLicense(Organization org, SubscriptionInfo subscriptionInfo, Guid installationId, - ILicensingService licenseService) + ILicensingService licenseService, int? version = null) { - Version = 6; // TODO: bump to version 7 + Version = version.GetValueOrDefault(6); // TODO: bump to version 7 LicenseKey = org.LicenseKey; InstallationId = installationId; Id = org.Id; diff --git a/src/Core/Models/Business/UserLicense.cs b/src/Core/Models/Business/UserLicense.cs index ca7e257da2..1c301fc253 100644 --- a/src/Core/Models/Business/UserLicense.cs +++ b/src/Core/Models/Business/UserLicense.cs @@ -15,13 +15,14 @@ namespace Bit.Core.Models.Business public UserLicense() { } - public UserLicense(User user, SubscriptionInfo subscriptionInfo, ILicensingService licenseService) + public UserLicense(User user, SubscriptionInfo subscriptionInfo, ILicensingService licenseService, + int? version = null) { LicenseKey = user.LicenseKey; Id = user.Id; Name = user.Name; Email = user.Email; - Version = 1; + Version = version.GetValueOrDefault(1); Premium = user.Premium; MaxStorageGb = user.MaxStorageGb; Issued = DateTime.UtcNow; @@ -34,13 +35,13 @@ namespace Bit.Core.Models.Business Signature = Convert.ToBase64String(licenseService.SignLicense(this)); } - public UserLicense(User user, ILicensingService licenseService) + public UserLicense(User user, ILicensingService licenseService, int? version = null) { LicenseKey = user.LicenseKey; Id = user.Id; Name = user.Name; Email = user.Email; - Version = 1; + Version = version.GetValueOrDefault(1); Premium = user.Premium; MaxStorageGb = user.MaxStorageGb; Issued = DateTime.UtcNow; diff --git a/src/Core/Services/IOrganizationService.cs b/src/Core/Services/IOrganizationService.cs index dba1bba8e3..38d7391560 100644 --- a/src/Core/Services/IOrganizationService.cs +++ b/src/Core/Services/IOrganizationService.cs @@ -45,7 +45,8 @@ namespace Bit.Core.Services Task DeleteUserAsync(Guid organizationId, Guid userId); Task UpdateUserGroupsAsync(OrganizationUser organizationUser, IEnumerable groupIds); Task GenerateLicenseAsync(Guid organizationId, Guid installationId); - Task GenerateLicenseAsync(Organization organization, Guid installationId); + Task GenerateLicenseAsync(Organization organization, Guid installationId, + int? version = null); Task ImportAsync(Guid organizationId, Guid? importingUserId, IEnumerable groups, IEnumerable newUsers, IEnumerable removeUserExternalIds, bool overwriteExisting); diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs index 86417bfbdc..58201554f4 100644 --- a/src/Core/Services/IUserService.cs +++ b/src/Core/Services/IUserService.cs @@ -61,7 +61,8 @@ namespace Bit.Core.Services Task DisablePremiumAsync(Guid userId, DateTime? expirationDate); Task DisablePremiumAsync(User user, DateTime? expirationDate); Task UpdatePremiumExpirationAsync(Guid userId, DateTime? expirationDate); - Task GenerateLicenseAsync(User user, SubscriptionInfo subscriptionInfo = null); + Task GenerateLicenseAsync(User user, SubscriptionInfo subscriptionInfo = null, + int? version = null); Task CheckPasswordAsync(User user, string password); Task CanAccessPremium(ITwoFactorProvidersUser user); Task TwoFactorIsEnabledAsync(ITwoFactorProvidersUser user); diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 794690159f..520a2e8313 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -1298,7 +1298,8 @@ namespace Bit.Core.Services return await GenerateLicenseAsync(organization, installationId); } - public async Task GenerateLicenseAsync(Organization organization, Guid installationId) + public async Task GenerateLicenseAsync(Organization organization, Guid installationId, + int? version = null) { if (organization == null) { diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index 4b16349bc5..a7c19eef3e 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -985,7 +985,8 @@ namespace Bit.Core.Services } } - public async Task GenerateLicenseAsync(User user, SubscriptionInfo subscriptionInfo = null) + public async Task GenerateLicenseAsync(User user, SubscriptionInfo subscriptionInfo = null, + int? version = null) { if (user == null) {