nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00
Code Activity

premium signup with license file

Browse Source
This commit is contained in:
Kyle Spearrin
2017-08-11 17:06:31 -04:00
parent 02bb037e38
commit 73029f76d2
15 changed files with 125 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Services/Implementations/RsaLicenseVerificationService.cs
View File

@ -28,8 +28,9 @@ namespace Bit.Core.Services
}
_globalSettings = globalSettings;
_certificate = CoreHelpers.GetCertificate("licensing.crt", null);
if(false && !_certificate.Thumbprint.Equals(""))
_certificate = CoreHelpers.GetEmbeddedCertificate("licensing.cer", null);
if(!_certificate.Thumbprint.Equals(CoreHelpers.CleanCertificateThumbprint(
"‎207e64a231e8aa32aaf68a61037c075ebebd553f"), StringComparison.InvariantCultureIgnoreCase))
{
throw new Exception("Invalid licensing certificate.");
}
@ -62,6 +63,11 @@ namespace Bit.Core.Services
return license != null && license.VerifyData(user) && license.VerifySignature(_certificate);
}
public bool VerifyLicense(ILicense license)
{
return license.VerifySignature(_certificate);
}
private UserLicense ReadUserLicense(User user)
{
if(_userLicenseCache != null && _userLicenseCache.ContainsKey(user.LicenseKey))

46
src/Core/Services/Implementations/UserService.cs
View File

@ -17,6 +17,8 @@ using U2F.Core.Models;
using U2F.Core.Utils;
using Bit.Core.Exceptions;
using Bit.Core.Utilities;
using System.IO;
using Newtonsoft.Json;
namespace Bit.Core.Services
{
@ -35,6 +37,7 @@ namespace Bit.Core.Services
private readonly IdentityOptions _identityOptions;
private readonly IPasswordHasher<User> _passwordHasher;
private readonly IEnumerable<IPasswordValidator<User>> _passwordValidators;
private readonly ILicenseVerificationService _licenseVerificationService;
private readonly CurrentContext _currentContext;
private readonly GlobalSettings _globalSettings;
@ -54,6 +57,7 @@ namespace Bit.Core.Services
IdentityErrorDescriber errors,
IServiceProvider services,
ILogger<UserManager<User>> logger,
ILicenseVerificationService licenseVerificationService,
CurrentContext currentContext,
GlobalSettings globalSettings)
: base(
@ -77,6 +81,7 @@ namespace Bit.Core.Services
_identityErrorDescriber = errors;
_passwordHasher = passwordHasher;
_passwordValidators = passwordValidators;
_licenseVerificationService = licenseVerificationService;
_currentContext = currentContext;
_globalSettings = globalSettings;
}
@ -481,7 +486,7 @@ namespace Bit.Core.Services
if(string.IsNullOrWhiteSpace(user.TwoFactorRecoveryCode))
{
user.TwoFactorRecoveryCode = Utilities.CoreHelpers.SecureRandomString(32, upper: false, special: false);
user.TwoFactorRecoveryCode = CoreHelpers.SecureRandomString(32, upper: false, special: false);
}
await SaveUserAsync(user);
}
@ -519,13 +524,13 @@ namespace Bit.Core.Services
}
user.TwoFactorProviders = null;
user.TwoFactorRecoveryCode = Utilities.CoreHelpers.SecureRandomString(32, upper: false, special: false);
user.TwoFactorRecoveryCode = CoreHelpers.SecureRandomString(32, upper: false, special: false);
await SaveUserAsync(user);
return true;
}
public async Task SignUpPremiumAsync(User user, string paymentToken, short additionalStorageGb)
public async Task SignUpPremiumAsync(User user, string paymentToken, short additionalStorageGb, UserLicense license)
{
if(user.Premium)
{
@ -533,19 +538,36 @@ namespace Bit.Core.Services
}
IPaymentService paymentService = null;
if(paymentToken.StartsWith("tok_"))
if(_globalSettings.SelfHosted)
{
paymentService = new StripePaymentService();
if(license == null || !_licenseVerificationService.VerifyLicense(license))
{
throw new BadRequestException("Invalid license.");
}
Directory.CreateDirectory(_globalSettings.LicenseDirectory);
File.WriteAllText(_globalSettings.LicenseDirectory, JsonConvert.SerializeObject(license, Formatting.Indented));
}
else if(!string.IsNullOrWhiteSpace(paymentToken))
{
if(paymentToken.StartsWith("tok_"))
{
paymentService = new StripePaymentService();
}
else
{
paymentService = new BraintreePaymentService(_globalSettings);
}
await paymentService.PurchasePremiumAsync(user, paymentToken, additionalStorageGb);
}
else
{
paymentService = new BraintreePaymentService(_globalSettings);
throw new InvalidOperationException("License or payment token is required.");
}
await paymentService.PurchasePremiumAsync(user, paymentToken, additionalStorageGb);
user.Premium = true;
user.MaxStorageGb = (short)(1 + additionalStorageGb);
user.MaxStorageGb = _globalSettings.SelfHosted ? (short)10240 : (short)(1 + additionalStorageGb);
user.RevisionDate = DateTime.UtcNow;
try
@ -554,7 +576,11 @@ namespace Bit.Core.Services
}
catch
{
await paymentService.CancelAndRecoverChargesAsync(user);
if(!_globalSettings.SelfHosted)
{
await paymentService.CancelAndRecoverChargesAsync(user);
}
throw;
}
}