Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-01 23:31:41 +01:00
Code Issues Projects Releases Wiki Activity

implement useapi and apikey

Browse Source
This commit is contained in:
Kyle Spearrin 2019-03-02 15:09:33 -05:00
parent 66729fec3f
commit 15cb0ad4c3
11 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Admin/Models/OrganizationEditModel.cs
View File

@ -33,6 +33,7 @@ namespace Bit.Admin.Models
UseEvents = org.UseEvents;
UseTotp = org.UseTotp;
Use2fa = org.Use2fa;
UseApi = org.UseApi;
SelfHost = org.SelfHost;
UsersGetPremium = org.UsersGetPremium;
MaxStorageGb = org.MaxStorageGb;
@ -76,6 +77,8 @@ namespace Bit.Admin.Models
public bool UseTotp { get; set; }
[Display(Name = "2FA")]
public bool Use2fa { get; set; }
[Display(Name = "API")]
public bool UseApi{ get; set; }
[Display(Name = "Self Host")]
public bool SelfHost { get; set; }
[Display(Name = "Users Get Premium")]
@ -109,6 +112,7 @@ namespace Bit.Admin.Models
existingOrganization.UseEvents = UseEvents;
existingOrganization.UseTotp = UseTotp;
existingOrganization.Use2fa = Use2fa;
existingOrganization.UseApi = UseApi;
existingOrganization.SelfHost = SelfHost;
existingOrganization.UsersGetPremium = UsersGetPremium;
existingOrganization.MaxStorageGb = MaxStorageGb;

5
src/Admin/Views/Organizations/Edit.cshtml
View File

@ -27,6 +27,7 @@
document.getElementById('@(nameof(Model.UsersGetPremium))').checked = true;
document.getElementById('@(nameof(Model.UseTotp))').checked = true;
document.getElementById('@(nameof(Model.Use2fa))').checked = true;
document.getElementById('@(nameof(Model.UseApi))').checked = true;
document.getElementById('@(nameof(Model.SelfHost))').checked = true;
// Licensing
document.getElementById('@(nameof(Model.LicenseKey))').value = '@Model.RandomLicenseKey';
@ -151,6 +152,10 @@
<input type="checkbox" class="form-check-input" asp-for="Use2fa">
<label class="form-check-label" asp-for="Use2fa"></label>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="UseApi">
<label class="form-check-label" asp-for="UseApi"></label>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="UseGroups">
<label class="form-check-label" asp-for="UseGroups"></label>

4
src/Core/IdentityServer/ClientStore.cs
View File

@ -87,11 +87,11 @@ namespace Bit.Core.IdentityServer
{
ClientId = $"organization.{org.Id}",
RequireClientSecret = true,
ClientSecrets = { new Secret("secret".Sha256()) }, // TODO: org.ApiKey
ClientSecrets = { new Secret(org.ApiKey.Sha256()) },
AllowedScopes = new string[] { "api.organization" },
AllowedGrantTypes = GrantTypes.ClientCredentials,
AccessTokenLifetime = 3600 * 1,
Enabled = org.Enabled, // TODO: && org.UseApi
Enabled = org.Enabled && org.UseApi,
Claims = new List<Claim> { new Claim(JwtClaimTypes.Subject, org.Id.ToString()) }
};
}

2
src/Core/Models/Api/Response/OrganizationResponseModel.cs
View File

@ -35,6 +35,7 @@ namespace Bit.Core.Models.Api
UseEvents = organization.UseEvents;
UseTotp = organization.UseTotp;
Use2fa = organization.Use2fa;
UseApi = organization.UseApi;
UsersGetPremium = organization.UsersGetPremium;
SelfHost = organization.SelfHost;
}
@ -58,6 +59,7 @@ namespace Bit.Core.Models.Api
public bool UseEvents { get; set; }
public bool UseTotp { get; set; }
public bool Use2fa { get; set; }
public bool UseApi { get; set; }
public bool UsersGetPremium { get; set; }
public bool SelfHost { get; set; }
}

2
src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs
View File

@ -15,6 +15,7 @@ namespace Bit.Core.Models.Api
UseEvents = organization.UseEvents;
UseTotp = organization.UseTotp;
Use2fa = organization.Use2fa;
UseApi = organization.UseApi;
UsersGetPremium = organization.UsersGetPremium;
SelfHost = organization.SelfHost;
Seats = organization.Seats;
@ -33,6 +34,7 @@ namespace Bit.Core.Models.Api
public bool UseEvents { get; set; }
public bool UseTotp { get; set; }
public bool Use2fa { get; set; }
public bool UseApi { get; set; }
public bool UsersGetPremium { get; set; }
public bool SelfHost { get; set; }
public int Seats { get; set; }

17
src/Core/Models/Business/OrganizationLicense.cs
View File

@ -19,7 +19,7 @@ namespace Bit.Core.Models.Business
public OrganizationLicense(Organization org, SubscriptionInfo subscriptionInfo, Guid installationId,
ILicensingService licenseService)
{
Version = 4;
Version = 4; // TODO: Version 5 bump
LicenseKey = org.LicenseKey;
InstallationId = installationId;
Id = org.Id;
@ -36,6 +36,7 @@ namespace Bit.Core.Models.Business
UseDirectory = org.UseDirectory;
UseTotp = org.UseTotp;
Use2fa = org.Use2fa;
UseApi = org.UseApi;
MaxStorageGb = org.MaxStorageGb;
SelfHost = org.SelfHost;
UsersGetPremium = org.UsersGetPremium;
@ -102,6 +103,7 @@ namespace Bit.Core.Models.Business
public bool UseDirectory { get; set; }
public bool UseTotp { get; set; }
public bool Use2fa { get; set; }
public bool UseApi { get; set; }
public short? MaxStorageGb { get; set; }
public bool SelfHost { get; set; }
public bool UsersGetPremium { get; set; }
@ -118,7 +120,7 @@ namespace Bit.Core.Models.Business
public byte[] GetDataBytes(bool forHash = false)
{
string data = null;
if(Version >= 1 && Version <= 4)
if(Version >= 1 && Version <= 5)
{
var props = typeof(OrganizationLicense)
.GetProperties(BindingFlags.Public | BindingFlags.Instance)
@ -131,6 +133,8 @@ namespace Bit.Core.Models.Business
(Version >= 3 || !p.Name.Equals(nameof(UseEvents))) &&
// Use2fa was added in Version 4
(Version >= 4 || !p.Name.Equals(nameof(Use2fa))) &&
// UseApi was added in Version 5
(Version >= 5 || !p.Name.Equals(nameof(UseApi))) &&
(
!forHash ||
(
@ -167,7 +171,7 @@ namespace Bit.Core.Models.Business
return false;
}
if(Version >= 1 && Version <= 4)
if(Version >= 1 && Version <= 5)
{
return InstallationId == globalSettings.Installation.Id && SelfHost;
}
@ -184,7 +188,7 @@ namespace Bit.Core.Models.Business
return false;
}
if(Version >= 1 && Version <= 4)
if(Version >= 1 && Version <= 5)
{
var valid =
globalSettings.Installation.Id == InstallationId &&
@ -214,6 +218,11 @@ namespace Bit.Core.Models.Business
valid = organization.Use2fa == Use2fa;
}
if(valid && Version >= 5)
{
valid = organization.UseApi == UseApi;
}
return valid;
}
else

1
src/Core/Models/Data/OrganizationUserOrganizationDetails.cs
View File

@ -12,6 +12,7 @@ namespace Bit.Core.Models.Data
public bool UseEvents { get; set; }
public bool UseTotp { get; set; }
public bool Use2fa { get; set; }
public bool UseApi{ get; set; }
public bool SelfHost { get; set; }
public bool UsersGetPremium { get; set; }
public int Seats { get; set; }

1
src/Core/Models/StaticStore/Plan.cs
View File

@ -19,6 +19,7 @@ namespace Bit.Core.Models.StaticStore
public bool UseEvents { get; set; }
public bool UseTotp { get; set; }
public bool Use2fa { get; set; }
public bool UseApi { get; set; }
public short? MaxStorageGb { get; set; }
public decimal BasePrice { get; set; }
public decimal SeatPrice { get; set; }

4
src/Core/Models/Table/Organization.cs
View File

@ -1,8 +1,6 @@
using System;
using Bit.Core.Utilities;
using Bit.Core.Enums;
using Bit.Core.Services;
using Bit.Core.Exceptions;
using System.Collections.Generic;
using Newtonsoft.Json;
using System.Linq;
@ -31,6 +29,7 @@ namespace Bit.Core.Models.Table
public bool UseEvents { get; set; }
public bool UseTotp { get; set; }
public bool Use2fa { get; set; }
public bool UseApi { get; set; }
public bool SelfHost { get; set; }
public bool UsersGetPremium { get; set; }
public long? Storage { get; set; }
@ -40,6 +39,7 @@ namespace Bit.Core.Models.Table
public string GatewaySubscriptionId { get; set; }
public bool Enabled { get; set; } = true;
public string LicenseKey { get; set; }
public string ApiKey { get; set; }
public string TwoFactorProviders { get; set; }
public DateTime? ExpirationDate { get; set; }
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;

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

@ -513,12 +513,14 @@ namespace Bit.Core.Services
UseDirectory = plan.UseDirectory,
UseTotp = plan.UseTotp,
Use2fa = plan.Use2fa,
UseApi = plan.UseApi,
SelfHost = plan.SelfHost,
UsersGetPremium = plan.UsersGetPremium || signup.PremiumAccessAddon,
Plan = plan.Name,
Gateway = null,
Enabled = true,
LicenseKey = CoreHelpers.SecureRandomString(20),
ApiKey = CoreHelpers.SecureRandomString(30),
CreationDate = DateTime.UtcNow,
RevisionDate = DateTime.UtcNow
};
@ -582,6 +584,7 @@ namespace Bit.Core.Services
UseEvents = license.UseEvents,
UseTotp = license.UseTotp,
Use2fa = license.Use2fa,
UseApi = license.UseApi,
Plan = license.Plan,
SelfHost = license.SelfHost,
UsersGetPremium = license.UsersGetPremium,
@ -591,6 +594,7 @@ namespace Bit.Core.Services
Enabled = license.Enabled,
ExpirationDate = license.Expires,
LicenseKey = license.LicenseKey,
ApiKey = CoreHelpers.SecureRandomString(30),
CreationDate = DateTime.UtcNow,
RevisionDate = DateTime.UtcNow
};
@ -740,6 +744,7 @@ namespace Bit.Core.Services
organization.UseEvents = license.UseEvents;
organization.UseTotp = license.UseTotp;
organization.Use2fa = license.Use2fa;
organization.UseApi = license.UseApi;
organization.SelfHost = license.SelfHost;
organization.UsersGetPremium = license.UsersGetPremium;
organization.Plan = license.Plan;

2
src/Core/Utilities/StaticStore.cs
View File

@ -169,6 +169,7 @@ namespace Bit.Core.Utilities
UseEvents = true,
UseTotp = true,
Use2fa = true,
UseApi = true,
MaxStorageGb = 1,
SelfHost = true,
UsersGetPremium = true
@ -191,6 +192,7 @@ namespace Bit.Core.Utilities
UseEvents = true,
UseTotp = true,
Use2fa = true,
UseApi = true,
MaxStorageGb = 1,
SelfHost = true,
UsersGetPremium = true