Revert "refactor(RSACryptographer): Entfernte nullbare Eigenschaft von Issuer und Audience."
This reverts commit 16565eca4d0d92182306e72081c73caa19f944c7.
This commit is contained in:
parent
16565eca4d
commit
600d17ef40
@ -8,8 +8,8 @@ namespace DigitalData.Core.Abstractions.Security
|
|||||||
|
|
||||||
public RSAEncryptionPadding Padding { get; init; }
|
public RSAEncryptionPadding Padding { get; init; }
|
||||||
|
|
||||||
public string Issuer { get; init; }
|
public string? Issuer { get; init; }
|
||||||
|
|
||||||
public string Audience { get; init; }
|
public string? Audience { get; init; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,58 +1,20 @@
|
|||||||
using DigitalData.Core.Abstractions.Security;
|
using DigitalData.Core.Abstractions.Security;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace DigitalData.Core.Security.Cryptographer
|
namespace DigitalData.Core.Security.Cryptographer
|
||||||
{
|
{
|
||||||
public class RSACryptographer : IRSACryptographer, IJsonOnDeserialized
|
public class RSACryptographer : IRSACryptographer
|
||||||
{
|
{
|
||||||
private string? _pem;
|
public required virtual string Pem { get; init; }
|
||||||
|
|
||||||
private string? _pemPath;
|
|
||||||
|
|
||||||
public virtual string Pem
|
|
||||||
{
|
|
||||||
get => _pem!;
|
|
||||||
init
|
|
||||||
{
|
|
||||||
ValidatePemInit();
|
|
||||||
_pem = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public string? PemPath
|
|
||||||
{
|
|
||||||
get => _pemPath;
|
|
||||||
init
|
|
||||||
{
|
|
||||||
_pemPath = value;
|
|
||||||
if (value is null)
|
|
||||||
return;
|
|
||||||
ValidatePemInit();
|
|
||||||
_pem = File.ReadAllText(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public RSAEncryptionPadding Padding { get; init; } = RSAEncryptionPadding.OaepSHA256;
|
public RSAEncryptionPadding Padding { get; init; } = RSAEncryptionPadding.OaepSHA256;
|
||||||
|
|
||||||
protected virtual RSA RSA { get; } = RSA.Create();
|
protected virtual RSA RSA { get; } = RSA.Create();
|
||||||
|
|
||||||
public string Issuer { get; init; } = string.Empty;
|
public string? Issuer { get; init; }
|
||||||
|
|
||||||
public string Audience { get; init; } = string.Empty;
|
public string? Audience { get; init; }
|
||||||
|
|
||||||
internal RSACryptographer() { }
|
internal RSACryptographer() { }
|
||||||
|
|
||||||
public void OnDeserialized()
|
|
||||||
{
|
|
||||||
if (Pem is null)
|
|
||||||
throw new InvalidOperationException($"Pem must be initialized. Issuer: {Issuer} and Audience: {Audience}");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ValidatePemInit()
|
|
||||||
{
|
|
||||||
if (_pem is not null)
|
|
||||||
throw new InvalidOperationException($"Pem can only be initilized once. Remove one of the Pem or Pem file initilizations. Issuer: {Issuer} and Audience: {Audience}");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5,7 +5,7 @@ namespace DigitalData.Core.Security.Cryptographer
|
|||||||
{
|
{
|
||||||
public class RSAEncryptor : RSACryptographer, IRSAEncryptor, IRSACryptographer
|
public class RSAEncryptor : RSACryptographer, IRSAEncryptor, IRSACryptographer
|
||||||
{
|
{
|
||||||
public override string Pem
|
public override required string Pem
|
||||||
{
|
{
|
||||||
get => base.Pem;
|
get => base.Pem;
|
||||||
init
|
init
|
||||||
@ -14,7 +14,7 @@ namespace DigitalData.Core.Security.Cryptographer
|
|||||||
base.Pem = value;
|
base.Pem = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] Encrypt(byte[] data) => RSA.Encrypt(data, Padding);
|
public byte[] Encrypt(byte[] data) => RSA.Encrypt(data, Padding);
|
||||||
|
|
||||||
public string Encrypt(string data) => RSA.Encrypt(data.Base64ToByte(), Padding).BytesToString();
|
public string Encrypt(string data) => RSA.Encrypt(data.Base64ToByte(), Padding).BytesToString();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user