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

Move signature algorithm

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-06-06 13:53:41 +02:00
parent 93292aa505
commit 18e5f8ebd2
No known key found for this signature in database
5 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/KeyManagement/Entities/UserSignatureKeyPair.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Enums; using Bit.Core.KeyManagement.Enums;
using Bit.Core.Utilities; using Bit.Core.Utilities;
#nullable enable #nullable enable

2
src/Core/Enums/SignatureAlgorithm.cs → src/Core/KeyManagement/Enums/SignatureAlgorithm.cs
View File

@ -1,4 +1,4 @@
namespace Bit.Core.Enums; namespace Bit.Core.KeyManagement.Enums;
// <summary> // <summary>
// Represents the algorithm / digital signature scheme used for a signature key pair. // Represents the algorithm / digital signature scheme used for a signature key pair.

2
src/Core/KeyManagement/Models/Data/SignatureKeyPairData.cs
View File

@ -1,7 +1,7 @@
#nullable enable #nullable enable
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Bit.Core.Enums; using Bit.Core.KeyManagement.Enums;
namespace Bit.Core.KeyManagement.Models.Data; namespace Bit.Core.KeyManagement.Models.Data;

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

@ -5,6 +5,7 @@ using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.KeyManagement.Repositories; using Bit.Core.KeyManagement.Repositories;
using Bit.Core.KeyManagement.UserKey; using Bit.Core.KeyManagement.UserKey;
using Bit.Core.Settings; using Bit.Core.Settings;
using Bit.Core.Utilities;
using Bit.Infrastructure.Dapper.Repositories; using Bit.Infrastructure.Dapper.Repositories;
using Dapper; using Dapper;
using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient;
@ -45,7 +46,7 @@ public class UserSignatureKeyPairRepository : Repository<UserSignatureKeyPair, G
"[dbo].[UserSignatureKeyPair_SetForRotation]", "[dbo].[UserSignatureKeyPair_SetForRotation]",
new new
{ {
Id = CoreHelpers.GenerateComb(); Id = CoreHelpers.GenerateComb(),
UserId = userId, UserId = userId,
SignatureAlgorithm = (byte)signingKeys.SignatureAlgorithm, SignatureAlgorithm = (byte)signingKeys.SignatureAlgorithm,
SigningKey = signingKeys.WrappedSigningKey, SigningKey = signingKeys.WrappedSigningKey,
@ -56,10 +57,10 @@ public class UserSignatureKeyPairRepository : Repository<UserSignatureKeyPair, G
commandType: CommandType.StoredProcedure, commandType: CommandType.StoredProcedure,
transaction: transaction); transaction: transaction);
}; };
} }
public UpdateEncryptedDataForKeyRotation UpdateForKeyRotation(Guid grantorId, SignatureKeyPairData signingKeys) public UpdateEncryptedDataForKeyRotation UpdateForKeyRotation(Guid grantorId, SignatureKeyPairData signingKeys)
{ {
return async (SqlConnection connection, SqlTransaction transaction) => return async (SqlConnection connection, SqlTransaction transaction) =>
{ {
await connection.QueryAsync( await connection.QueryAsync(
@ -75,5 +76,5 @@ public UpdateEncryptedDataForKeyRotation UpdateForKeyRotation(Guid grantorId, Si
commandType: CommandType.StoredProcedure, commandType: CommandType.StoredProcedure,
transaction: transaction); transaction: transaction);
}; };
} }
} }

1
src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs
View File

@ -3,6 +3,7 @@ using AutoMapper;
using Bit.Core.KeyManagement.Models.Data; using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.KeyManagement.Repositories; using Bit.Core.KeyManagement.Repositories;
using Bit.Core.KeyManagement.UserKey; using Bit.Core.KeyManagement.UserKey;
using Bit.Core.Utilities;
using Bit.Infrastructure.EntityFramework.Repositories; using Bit.Infrastructure.EntityFramework.Repositories;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;