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

Moved VerifySignature out of the licenses and into an extension method

Browse Source
This commit is contained in:
Conner Turnbull 2025-06-09 15:15:54 -04:00
parent 7f28c4ff2f
commit c405092a1e
No known key found for this signature in database
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
using System.Reflection;
using System.Security.Claims;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Enums;
@ -13,12 +14,14 @@ namespace Bit.Core.Billing.Licenses.Extensions;
public static class LicenseExtensions
{
public static byte[] ComputeHash(this ILicense license)
public static byte[] ComputeHash(this ILicense license) => SHA256.HashData(license.GetDataBytes(true));
public static bool VerifySignature(this ILicense license, X509Certificate2 certificate)
{
using (var alg = SHA256.Create())
{
return alg.ComputeHash(license.GetDataBytes(true));
}
var dataBytes = license.GetDataBytes();
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)

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

@ -49,14 +49,6 @@ public abstract class BaseLicense : ILicense
public abstract byte[] GetDataBytes(bool forHash = false);
public bool VerifySignature(X509Certificate2 certificate)
{
using (var rsa = certificate.GetRSAPublicKey())
{
return rsa.VerifyData(GetDataBytes(), Convert.FromBase64String(Signature), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
}
}
public byte[] Sign(X509Certificate2 certificate)
{
if (!certificate.HasPrivateKey)

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

@ -16,6 +16,5 @@ public interface ILicense
string Signature { get; set; }
string Token { get; set; }
byte[] GetDataBytes(bool forHash = false);
bool VerifySignature(X509Certificate2 certificate);
byte[] Sign(X509Certificate2 certificate);
}

1
src/Core/Services/Implementations/LicensingService.cs
View File

@ -4,6 +4,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Text.Json;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Licenses.Extensions;
using Bit.Core.Billing.Licenses.Models;
using Bit.Core.Billing.Licenses.Services;
using Bit.Core.Entities;