nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-07 11:40:31 -05:00
Code

Enable nullable

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-06-05 16:24:14 +02:00
parent fa2e314c4f
commit a33bf793e1
No known key found for this signature in database
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
#nullable enable #nullable enable
using System.Text.Json.Serialization;
using Bit.Core.Enums; using Bit.Core.Enums;
namespace Bit.Core.KeyManagement.Models.Data; namespace Bit.Core.KeyManagement.Models.Data;
@ -9,4 +10,13 @@ public class SignatureKeyPairData
public required SignatureAlgorithm SignatureAlgorithm { get; set; } public required SignatureAlgorithm SignatureAlgorithm { get; set; }
public required string WrappedSigningKey { get; set; } public required string WrappedSigningKey { get; set; }
public required string VerifyingKey { get; set; } public required string VerifyingKey { get; set; }
[JsonConstructor]
[System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute]
public SignatureKeyPairData(SignatureAlgorithm signatureAlgorithm, string wrappedSigningKey, string verifyingKey)
{
SignatureAlgorithm = signatureAlgorithm;
WrappedSigningKey = wrappedSigningKey ?? throw new ArgumentNullException(nameof(wrappedSigningKey));
VerifyingKey = verifyingKey ?? throw new ArgumentNullException(nameof(verifyingKey));
}
} }

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

@ -25,12 +25,11 @@ public class UserSignatureKeyPairRepository : Repository<Core.KeyManagement.Enti
return null; return null;
} }
return new SignatureKeyPairData return new SignatureKeyPairData(
{ signingKeys.SignatureAlgorithm,
SignatureAlgorithm = signingKeys.SignatureAlgorithm, signingKeys.SigningKey,
WrappedSigningKey = signingKeys.SigningKey, signingKeys.VerifyingKey
VerifyingKey = signingKeys.VerifyingKey, );
};
} }
public UpdateEncryptedDataForKeyRotation SetUserSignatureKeyPair(Guid userId, SignatureKeyPairData signingKeys) public UpdateEncryptedDataForKeyRotation SetUserSignatureKeyPair(Guid userId, SignatureKeyPairData signingKeys)