nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-20 02:48:03 -05:00
Code

Apply fixes

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-06-17 20:07:24 +02:00
parent 76e9be5ef6
commit f15dcdba5e
No known key found for this signature in database
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Api/KeyManagement/Models/Requests/SignatureKeyPairRequestModel.cs
View File

@ -1,5 +1,4 @@
#nullable enable #nullable enable
using Bit.Core.KeyManagement.Enums;
using Bit.Core.KeyManagement.Models.Data; using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.Utilities; using Bit.Core.Utilities;
@ -7,14 +6,22 @@ namespace Bit.Api.KeyManagement.Models.Requests;
public class SignatureKeyPairRequestModel public class SignatureKeyPairRequestModel
{ {
public required SignatureAlgorithm SignatureAlgorithm { get; set; } public required string SignatureAlgorithm { get; set; }
[EncryptedString] public required string WrappedSigningKey { get; set; } [EncryptedString] public required string WrappedSigningKey { get; set; }
public required string VerifyingKey { get; set; } public required string VerifyingKey { get; set; }
public SignatureKeyPairData ToSignatureKeyPairData() public SignatureKeyPairData ToSignatureKeyPairData()
{ {
if (SignatureAlgorithm != "ed25519")
{
throw new ArgumentException(
$"Unsupported signature algorithm: {SignatureAlgorithm}"
);
}
var algorithm = Core.KeyManagement.Enums.SignatureAlgorithm.Ed25519;
return new SignatureKeyPairData( return new SignatureKeyPairData(
SignatureAlgorithm, algorithm,
WrappedSigningKey, WrappedSigningKey,
VerifyingKey VerifyingKey
); );

4
src/Api/KeyManagement/Models/Response/SignatureKeyPairResponseModel.cs
View File

@ -8,8 +8,8 @@ namespace Bit.Api.KeyManagement.Models.Response;
public class SignatureKeyPairResponseModel : ResponseModel public class SignatureKeyPairResponseModel : ResponseModel
{ {
public required string WrappedSigningKey; public required string WrappedSigningKey { get; set; }
public required string VerifyingKey; public required string VerifyingKey { get; set; }
[System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute] [System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute]
public SignatureKeyPairResponseModel(SignatureKeyPairData signatureKeyPair) public SignatureKeyPairResponseModel(SignatureKeyPairData signatureKeyPair)

6
src/Infrastructure.Dapper/KeyManagement/Repositories/UserSignatureKeyPairRepository.cs
View File

@ -28,13 +28,13 @@ public class UserSignatureKeyPairRepository : Repository<UserSignatureKeyPair, G
{ {
using (var connection = new SqlConnection(ConnectionString)) using (var connection = new SqlConnection(ConnectionString))
{ {
return await connection.QuerySingleOrDefaultAsync<SignatureKeyPairData>( return (await connection.QuerySingleOrDefaultAsync<UserSignatureKeyPair>(
"[dbo].[UserSignatureKeyPair_ReadByUserId]", "[dbo].[UserSignatureKeyPair_ReadByUserId]",
new new
{ {
UserId = userId UserId = userId
}, },
commandType: CommandType.StoredProcedure); commandType: CommandType.StoredProcedure))?.ToSignatureKeyPairData();
} }
} }
@ -48,7 +48,7 @@ public class UserSignatureKeyPairRepository : Repository<UserSignatureKeyPair, G
{ {
Id = CoreHelpers.GenerateComb(), Id = CoreHelpers.GenerateComb(),
UserId = userId, UserId = userId,
SignatureAlgorithm = (byte)signingKeys.SignatureAlgorithm, SignatureKeyPairAlgorithm = (byte)signingKeys.SignatureAlgorithm,
SigningKey = signingKeys.WrappedSigningKey, SigningKey = signingKeys.WrappedSigningKey,
signingKeys.VerifyingKey, signingKeys.VerifyingKey,
CreationDate = DateTime.UtcNow, CreationDate = DateTime.UtcNow,