nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-15 10:08:14 -05:00
Code

license adjustments for premium creation

Browse Source
This commit is contained in:
Kyle Spearrin 2017-08-11 23:08:41 -04:00
parent 9c254a7325
commit 67edcd035c
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Api/Controllers/AccountsController.cs
View File

@ -396,22 +396,36 @@ namespace Bit.Api.Controllers
UserLicense license = null; UserLicense license = null;
if(valid && _globalSettings.SelfHosted && model.License != null) if(valid && _globalSettings.SelfHosted && model.License != null)
{ {
try if(!HttpContext.Request.ContentLength.HasValue || HttpContext.Request.ContentLength.Value > 51200) // 50 KB
{
using (var stream = model.License.OpenReadStream())
using(var reader = new StreamReader(stream))
{
var s = await reader.ReadToEndAsync();
license = JsonConvert.DeserializeObject<UserLicense>(s);
}
}
catch
{ {
valid = false; valid = false;
} }
else
{
try
{
using(var stream = model.License.OpenReadStream())
using(var reader = new StreamReader(stream))
{
var s = await reader.ReadToEndAsync();
if(string.IsNullOrWhiteSpace(s))
{
valid = false;
}
else
{
license = JsonConvert.DeserializeObject<UserLicense>(s);
}
}
}
catch
{
valid = false;
}
}
} }
if(!valid) if(!valid || (_globalSettings.SelfHosted && license == null))
{ {
throw new BadRequestException("Invalid license."); throw new BadRequestException("Invalid license.");
} }

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

@ -572,7 +572,7 @@ namespace Bit.Core.Services
if(_globalSettings.SelfHosted) if(_globalSettings.SelfHosted)
{ {
user.MaxStorageGb = 10240; user.MaxStorageGb = 10240; // 10 TB
user.LicenseKey = license.LicenseKey; user.LicenseKey = license.LicenseKey;
} }
else else