nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-13 14:30:50 -05:00
Code

Moved the remaining methods out of BaseLicense. Renamed GetDataBytes to ToByteArray

Browse Source
This commit is contained in:
Conner Turnbull 2025-06-09 15:35:42 -04:00
parent c405092a1e
commit 5ed8635f9c
No known key found for this signature in database
5 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
View File

@ -14,18 +14,37 @@ namespace Bit.Core.Billing.Licenses.Extensions;
public static class LicenseExtensions
{
public static byte[] ComputeHash(this ILicense license) => SHA256.HashData(license.GetDataBytes(true));
public static byte[] ComputeHash(this ILicense license) => SHA256.HashData(license.ToByteArray(true));
public static bool VerifySignature(this ILicense license, X509Certificate2 certificate)
{
var dataBytes = license.GetDataBytes();
var dataBytes = license.ToByteArray();
var signatureBytes = Convert.FromBase64String(license.Signature);
using var rsa = certificate.GetRSAPublicKey();
return rsa.VerifyData(dataBytes, signatureBytes, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
}
public static byte[] GetDataBytesWithAttributes(this ILicense license, bool forHash = false)
public static byte[] Sign(this ILicense license, X509Certificate2 certificate)
{
if (!certificate.HasPrivateKey)
{
throw new InvalidOperationException("You don't have the private key!");
}
var dataBytes = license.ToByteArray();
using var rsa = certificate.GetRSAPrivateKey();
return rsa.SignData(dataBytes, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
}
public static byte[] ToByteArray(this ILicense license, bool forHash = false)
{
if (!license.ValidLicenseVersion)
{
throw new NotSupportedException($"Version {license.Version} is not supported.");
}
var props = license.GetType()
.GetProperties(BindingFlags.Public | BindingFlags.Instance)
.Where(p =>

20
src/Core/Models/Business/BaseLicense.cs
View File

@ -1,5 +1,4 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Text.Json.Serialization;
using Bit.Core.Billing.Licenses.Attributes;
using Bit.Core.Enums;
@ -47,18 +46,7 @@ public abstract class BaseLicense : ILicense
[LicenseIgnore]
public string Token { get; set; }
public abstract byte[] GetDataBytes(bool forHash = false);
public byte[] Sign(X509Certificate2 certificate)
{
if (!certificate.HasPrivateKey)
{
throw new InvalidOperationException("You don't have the private key!");
}
using (var rsa = certificate.GetRSAPrivateKey())
{
return rsa.SignData(GetDataBytes(), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
}
}
[LicenseIgnore]
[JsonIgnore]
public abstract bool ValidLicenseVersion { get; }
}

6
src/Core/Models/Business/ILicense.cs
View File

@ -1,5 +1,4 @@
using System.Security.Cryptography.X509Certificates;
using Bit.Core.Enums;
using Bit.Core.Enums;
namespace Bit.Core.Models.Business;
@ -15,6 +14,5 @@ public interface ILicense
string Hash { get; set; }
string Signature { get; set; }
string Token { get; set; }
byte[] GetDataBytes(bool forHash = false);
byte[] Sign(X509Certificate2 certificate);
bool ValidLicenseVersion { get; }
}

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

@ -1,5 +1,6 @@
using System.Security.Claims;
using System.Text;
using System.Text.Json.Serialization;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Licenses.Attributes;
@ -207,20 +208,14 @@ public class OrganizationLicense : BaseLicense
[LicenseIgnore]
public bool UseRiskInsights { get; set; }
private bool ValidLicenseVersion
[LicenseIgnore]
[JsonIgnore]
public override bool ValidLicenseVersion
{
get => Version is >= 1 and <= CurrentLicenseFileVersion + 1;
}
public override byte[] GetDataBytes(bool forHash = false)
{
if (!ValidLicenseVersion)
{
throw new NotSupportedException($"Version {Version} is not supported.");
}
return this.GetDataBytesWithAttributes(forHash);
}
public bool CanUse(
IGlobalSettings globalSettings,

15
src/Core/Models/Business/UserLicense.cs
View File

@ -1,5 +1,6 @@
using System.Security.Claims;
using System.Text;
using System.Text.Json.Serialization;
using Bit.Core.Billing.Licenses.Attributes;
using Bit.Core.Billing.Licenses.Extensions;
using Bit.Core.Entities;
@ -60,21 +61,13 @@ public class UserLicense : BaseLicense
[LicenseVersion(1)]
public short? MaxStorageGb { get; set; }
private bool ValidLicenseVersion
[LicenseIgnore]
[JsonIgnore]
public override bool ValidLicenseVersion
{
get => Version == 1;
}
public override byte[] GetDataBytes(bool forHash = false)
{
if (!ValidLicenseVersion)
{
throw new NotSupportedException($"Version {Version} is not supported.");
}
return this.GetDataBytesWithAttributes(forHash);
}
public bool CanUse(User user, ClaimsPrincipal claimsPrincipal, out string exception)
{
var errorMessages = new StringBuilder();