chore(Security): Description fixed

- Benennung der perm-Datei aktualisiert.

DigitalData.Core.Abstractions/DigitalData.Core.Abstractions.csproj

@@ -9,7 +9,7 @@
 		<Authors>Digital Data GmbH</Authors>
 		<Company>Digital Data GmbH</Company>
 		<Product>DigitalData.Core.Abstractions</Product>
-		<Description>This package contains abstractions for the DigitalData.Core.Abstractions library, developed according to the principles of Clean Architecture. It promotes separation of concerns and enables independent core logic.</Description>
+		<Description>This package contains abstractions for the DigitalData.Core library, developed according to the principles of Clean Architecture. It promotes separation of concerns and enables independent core logic.</Description>
 		<PackageTags>digital data core abstractions clean architecture</PackageTags>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Copyright>Copyright 2024</Copyright>
@@ -17,9 +17,9 @@
 		<RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
 		<PackAsTool>False</PackAsTool>
 		<PackageIcon>core_icon.png</PackageIcon>
-		<Version>3.0.0</Version>
-		<AssemblyVersion>3.0.0</AssemblyVersion>
-		<FileVersion>3.0.0</FileVersion>
+		<Version>3.1.0</Version>
+		<AssemblyVersion>3.1.0</AssemblyVersion>
+		<FileVersion>3.1.0</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

DigitalData.Core.Abstractions/Security/CryptographerExtensions.cs

@@ -1,21 +0,0 @@
-namespace DigitalData.Core.Abstractions.Security
-{
-    public static class CryptographerExtensions
-    {
-        public static IEnumerable<TRSACryptographer> GetByIssuer<TRSACryptographer>(this IEnumerable<TRSACryptographer> cryptographers, string issuer) where TRSACryptographer: IRSACryptographer
-            => cryptographers.Where(c => c.Issuer == issuer);
-
-        public static IEnumerable<TRSACryptographer> GetByAudience<TRSACryptographer>(this IEnumerable<TRSACryptographer> cryptographers, string audience) where TRSACryptographer : IRSACryptographer
-            => cryptographers.Where(c => c.Audience == audience);
-
-        public static TRSACryptographer Get<TRSACryptographer>(this IEnumerable<TRSACryptographer> cryptographers, string issuer, string audience) where TRSACryptographer : IRSACryptographer
-            => cryptographers.Where(c => c.Issuer == issuer && c.Audience == audience).SingleOrDefault()
-            ?? throw new InvalidOperationException($"No {typeof(TRSACryptographer).GetType().Name.TrimStart('I')} found with Issuer: {issuer} and Audience: {audience}.");
-
-        public static bool TryGet<TRSACryptographer>(this IEnumerable<TRSACryptographer> cryptographers, string issuer, string audience, out TRSACryptographer? cryptographer) where TRSACryptographer : IRSACryptographer
-        {
-            cryptographer = cryptographers.SingleOrDefault(c => c.Issuer == issuer && c.Audience == audience);
-            return cryptographer is not null;
-        }
-    }
-}

DigitalData.Core.Abstractions/Security/IAsymCryptService.cs

@@ -1,15 +0,0 @@
-namespace DigitalData.Core.Abstractions.Security
-{
-    public interface IAsymCryptService : IRSAFactory, IEnumerable<IRSADecryptor>
-    {
-        IEnumerable<IRSADecryptor> Decryptors { get; }
-
-        IRSADecryptor Vault { get; }
-
-        IRSADecryptor this[string key] { get; }
-
-        IEnumerable<IRSAEncryptor> Encryptors { get; }
-    }
-
-    public interface IAsymCryptService<TParams> : IAsymCryptService, IRSAFactory<TParams> { }
-}

DigitalData.Core.Abstractions/Security/IAsymmetricDecryptor.cs

@@ -0,0 +1,9 @@
+namespace DigitalData.Core.Abstractions.Security
+{
+    public interface IAsymmetricDecryptor : IAsymmetricPrivateKey
+    {
+        byte[] Decrypt(byte[] data);
+
+        IAsymmetricEncryptor Encryptor { get; }
+    }
+}

DigitalData.Core.Abstractions/Security/IAsymmetricEncryptor.cs

@@ -0,0 +1,7 @@
+namespace DigitalData.Core.Abstractions.Security
+{
+    public interface IAsymmetricEncryptor : IAsymmetricPublicKey
+    {
+        byte[] Encrypt(byte[] data);
+    }
+}

DigitalData.Core.Abstractions/Security/IAsymmetricKey.cs

@@ -0,0 +1,9 @@
+namespace DigitalData.Core.Abstractions.Security
+{
+    public interface IAsymmetricKey
+    {
+        string? Id { get; }
+
+        string Content { get; }
+    }
+}

DigitalData.Core.Abstractions/Security/IAsymmetricKeyFactory.cs

@@ -2,7 +2,7 @@
 
 namespace DigitalData.Core.Abstractions.Security
 {
-    public interface IRSAFactory
+    public interface IAsymmetricKeyFactory
     {
         string CreatePrivateKeyPem(int? keySizeInBits = null, bool encrypt = false);
 
@@ -18,8 +18,6 @@ namespace DigitalData.Core.Abstractions.Security
             int? keySizeInBits = null,
             string? password = null);
 
-        IRSADecryptor CreateDecryptor(string pem, string? issuer = null, string? audience = null, bool encrypt = false, RSAEncryptionPadding? padding = null);
+        IAsymmetricDecryptor CreateDecryptor(string pem, string? issuer = null, string? audience = null, bool encrypt = false, RSAEncryptionPadding? padding = null);
     }
-
-    public interface IRSAFactory<TParams> : IRSAFactory { }
 }

DigitalData.Core.Abstractions/Security/IAsymmetricPrivateKey.cs

@@ -0,0 +1,9 @@
+namespace DigitalData.Core.Abstractions.Security
+{
+    public interface IAsymmetricPrivateKey : IAsymmetricKey
+    {
+        bool IsEncrypted { get; }
+
+        IAsymmetricPublicKey PublicKey { get; }
+    }
+}

DigitalData.Core.Abstractions/Security/IAsymmetricPublicKey.cs

@@ -0,0 +1,6 @@
+namespace DigitalData.Core.Abstractions.Security
+{
+    public interface IAsymmetricPublicKey : IAsymmetricKey
+    {
+    }
+}

DigitalData.Core.Abstractions/Security/IAsymmetricTokenDescriptor.cs

@@ -0,0 +1,74 @@
+using Microsoft.IdentityModel.Tokens;
+
+namespace DigitalData.Core.Abstractions.Security
+{
+    /// <summary>
+    /// Contains some information which used to create a security token. Designed to abstract <see cref="SecurityTokenDescriptor"/>
+    /// </summary>
+    public interface IAsymmetricTokenDescriptor : IAsymmetricPrivateKey, IUniqueSecurityContext
+    {
+        IAsymmetricTokenValidator Validator { get; }
+
+        TimeSpan Lifetime { get; init; }
+
+        #region SecurityTokenDescriptor Map
+        /// <summary>
+        /// Defines the compression algorithm that will be used to compress the JWT token payload.
+        /// </summary>
+        string CompressionAlgorithm { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="EncryptingCredentials"/> used to create a encrypted security token.
+        /// </summary>
+        EncryptingCredentials EncryptingCredentials { get; }
+
+        /// <summary>
+        /// Gets or sets the value of the 'expiration' claim. This value should be in UTC.
+        /// </summary>
+        DateTime? Expires { get; }
+
+        /// <summary>
+        /// Gets or sets the time the security token was issued. This value should be in UTC.
+        /// </summary>
+        DateTime? IssuedAt { get; }
+
+        /// <summary>
+        /// Gets or sets the notbefore time for the security token. This value should be in UTC.
+        /// </summary>
+        DateTime? NotBefore { get; }
+
+        /// <summary>
+        /// Gets or sets the token type.
+        /// <remarks> If provided, this will be added as the value for the 'typ' header parameter. In the case of a JWE, this will be added to both the inner (JWS) and the outer token (JWE) header. By default, the value used is 'JWT'.
+        /// If <see cref="AdditionalHeaderClaims"/> also contains 'typ' header claim value, it will override the TokenType provided here.
+        /// This value is used only for JWT tokens and not for SAML/SAML2 tokens</remarks>
+        /// </summary>
+        string TokenType { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Dictionary{TKey, TValue}"/> which contains any custom header claims that need to be added to the JWT token header.
+        /// The 'alg', 'kid', 'x5t', 'enc', and 'zip' claims are added by default based on the <see cref="SigningCredentials"/>,
+        /// <see cref="EncryptingCredentials"/>, and/or <see cref="CompressionAlgorithm"/> provided and SHOULD NOT be included in this dictionary as this
+        /// will result in an exception being thrown. 
+        /// <remarks> These claims are only added to the outer header (in case of a JWE).</remarks>
+        /// </summary>
+        IDictionary<string, object> AdditionalHeaderClaims { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Dictionary{TKey, TValue}"/> which contains any custom header claims that need to be added to the inner JWT token header.
+        /// The 'alg', 'kid', 'x5t', 'enc', and 'zip' claims are added by default based on the <see cref="SigningCredentials"/>,
+        /// <see cref="EncryptingCredentials"/>, and/or <see cref="CompressionAlgorithm"/> provided and SHOULD NOT be included in this dictionary as this
+        /// will result in an exception being thrown. 
+        /// <remarks>
+        /// For JsonWebTokenHandler, these claims are merged with <see cref="AdditionalHeaderClaims"/> while adding to the inner JWT header.
+        /// </remarks>
+        /// </summary>
+        IDictionary<string, object> AdditionalInnerHeaderClaims { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="SigningCredentials"/> used to create a security token.
+        /// </summary>
+        SigningCredentials SigningCredentials { get; }
+        #endregion SecurityTokenDescriptor
+    }
+}

DigitalData.Core.Abstractions/Security/IAsymmetricTokenValidator.cs

@@ -0,0 +1,9 @@
+using Microsoft.IdentityModel.Tokens;
+
+namespace DigitalData.Core.Abstractions.Security
+{
+    public interface IAsymmetricTokenValidator : IAsymmetricPublicKey
+    {
+        SecurityKey SecurityKey { get; }
+    }
+}

DigitalData.Core.Abstractions/Security/ICryptoFactory.cs

@@ -0,0 +1,11 @@
+namespace DigitalData.Core.Abstractions.Security
+{
+    public interface ICryptoFactory : IAsymmetricKeyFactory
+    {
+        IEnumerable<IAsymmetricDecryptor> Decryptors { get; }
+
+        IAsymmetricDecryptor VaultDecryptor { get; }
+
+        IEnumerable<IAsymmetricTokenDescriptor> TokenDescriptors { get; }
+    }
+}

DigitalData.Core.Abstractions/Security/IJwtSignatureHandler.cs

@@ -0,0 +1,15 @@
+using Microsoft.IdentityModel.Tokens;
+
+namespace DigitalData.Core.Abstractions.Security
+{
+    public interface IJwtSignatureHandler<TPrincipal>
+    {
+        SecurityToken CreateToken(SecurityTokenDescriptor tokenDescriptor);
+
+        SecurityToken CreateToken(TPrincipal subject, IAsymmetricTokenDescriptor descriptor);
+
+        SecurityToken CreateToken(TPrincipal subject, string issuer, string audience);
+
+        string WriteToken(SecurityToken token);
+    }
+}

DigitalData.Core.Abstractions/Security/IRSACryptographer.cs

@@ -1,15 +0,0 @@
-using System.Security.Cryptography;
-
-namespace DigitalData.Core.Abstractions.Security
-{
-    public interface IRSACryptographer
-    {
-        public string Pem { get; init; }
-
-        public RSAEncryptionPadding Padding { get; init; }
-        
-        public string Issuer { get; init; }
-
-        public string Audience { get; init; }
-    }
-}

DigitalData.Core.Abstractions/Security/IRSADecryptor.cs

@@ -1,13 +0,0 @@
-namespace DigitalData.Core.Abstractions.Security
-{
-    public interface IRSADecryptor : IRSACryptographer
-    {
-        public bool IsEncrypted { get; init; }
-
-        IRSAEncryptor Encryptor { get; }
-
-        byte[] Decrypt(byte[] data);
-
-        string Decrypt(string data);
-    }
-}

DigitalData.Core.Abstractions/Security/IRSAEncryptor.cs

@@ -1,11 +0,0 @@
-namespace DigitalData.Core.Abstractions.Security
-{
-    public interface IRSAEncryptor : IRSACryptographer
-    {
-        public byte[] Encrypt(byte[] data);
-
-        public string Encrypt(string data);
-
-        public bool Verify(string data, string signature) => Encrypt(data) == signature;
-    }
-}

DigitalData.Core.Abstractions/Security/IUniqueSecurityContext.cs

@@ -0,0 +1,24 @@
+namespace DigitalData.Core.Abstractions.Security
+{
+    /// <summary>
+    /// Represents a unique security context that identifies an issuer and an audience.
+    /// </summary>
+    public interface IUniqueSecurityContext
+    {
+        /// <summary>
+        /// Gets the issuer identifier for this security context.
+        /// </summary>
+        /// <remarks>
+        /// The issuer typically represents the entity that issues a token or a cryptographic key.
+        /// </remarks>
+        string Issuer { get; }
+
+        /// <summary>
+        /// Gets the audience identifier for this security context.
+        /// </summary>
+        /// <remarks>
+        /// The audience typically represents the intended recipient or target of a token or cryptographic operation.
+        /// </remarks>
+        string Audience { get; }
+    }
+}

DigitalData.Core.Abstractions/Security/SecurityExtensions.cs

@@ -0,0 +1,62 @@
+using Microsoft.IdentityModel.Tokens;
+using System.Text;
+
+namespace DigitalData.Core.Abstractions.Security
+{
+    public static class SecurityExtensions
+    {
+        #region Unique Security Context
+        public static IEnumerable<TUniqueSecurityContext> GetByIssuer<TUniqueSecurityContext>(this IEnumerable<TUniqueSecurityContext> contextes, string issuer) where TUniqueSecurityContext: IUniqueSecurityContext
+            => contextes.Where(c => c.Issuer == issuer);
+
+        public static IEnumerable<TUniqueSecurityContext> GetByAudience<TUniqueSecurityContext>(this IEnumerable<TUniqueSecurityContext> contextes, string audience) where TUniqueSecurityContext : IUniqueSecurityContext
+            => contextes.Where(c => c.Audience == audience);
+
+        public static TUniqueSecurityContext Get<TUniqueSecurityContext>(this IEnumerable<TUniqueSecurityContext> contextes, string issuer, string audience) where TUniqueSecurityContext : IUniqueSecurityContext
+            => contextes.Where(c => c.Issuer == issuer && c.Audience == audience).SingleOrDefault()
+            ?? throw new InvalidOperationException($"Exactly one {typeof(TUniqueSecurityContext).Name} must exist with Issuer: '{issuer}' and Audience: '{audience}'.");
+
+        public static bool TryGet<TUniqueSecurityContext>(this IEnumerable<TUniqueSecurityContext> contextes, string issuer, string audience, out TUniqueSecurityContext context) where TUniqueSecurityContext : IUniqueSecurityContext
+        {
+#pragma warning disable CS8601 // Possible null reference assignment.
+            context = contextes.SingleOrDefault(c => c.Issuer == issuer && c.Audience == audience);
+#pragma warning restore CS8601 // Possible null reference assignment.
+            return context is not null;
+        }
+
+        public static TUniqueSecurityContext Match<TUniqueSecurityContext>(this IEnumerable<TUniqueSecurityContext> contextes, IUniqueSecurityContext lookupContext) where TUniqueSecurityContext : IUniqueSecurityContext
+            => contextes.Get(lookupContext.Issuer, lookupContext.Audience);
+
+        public static bool TryMatch<TUniqueSecurityContext>(this IEnumerable<TUniqueSecurityContext> contextes, IUniqueSecurityContext lookupContext, out TUniqueSecurityContext context) where TUniqueSecurityContext : IUniqueSecurityContext
+            => contextes.TryGet(lookupContext.Issuer, lookupContext.Audience, out context);
+        #endregion Unique Security Context
+
+        #region De/serilization
+        internal static byte[] Base64ToByte(this string base64String) => Convert.FromBase64String(base64String);
+
+        internal static string BytesToString(this byte[] bytes) => Encoding.UTF8.GetString(bytes);
+
+        internal static string ToBase64String(this byte[] bytes) => Convert.ToBase64String(bytes);
+
+        internal static byte[] ToBytes(this string str) => System.Text.Encoding.UTF8.GetBytes(str);
+
+        public static string Decrypt(this IAsymmetricDecryptor decryptor, string data) => decryptor
+            .Decrypt(data.Base64ToByte()).BytesToString();
+        #endregion De/serilization
+
+        #region Asymmetric Encryptor
+        public static string Encrypt(this IAsymmetricEncryptor encryptor, string data) => encryptor.Encrypt(data.ToBytes()).ToBase64String();
+        #endregion Asymmetric Encryptor
+
+        #region Jwt Signature Handler
+        public static string WriteToken<TPrincipal>(this IJwtSignatureHandler<TPrincipal> handler, SecurityTokenDescriptor descriptor)
+            => handler.WriteToken(handler.CreateToken(descriptor));
+
+        public static string WriteToken<TPrincipal>(this IJwtSignatureHandler<TPrincipal> handler, TPrincipal subject, IAsymmetricTokenDescriptor descriptor)
+            => handler.WriteToken(handler.CreateToken(subject: subject, descriptor: descriptor));
+
+        public static string WriteToken<TPrincipal>(this IJwtSignatureHandler<TPrincipal> handler, TPrincipal subject, string issuer, string audience)
+            => handler.WriteToken(handler.CreateToken(subject: subject, issuer: issuer, audience: audience));
+        #endregion Jwt Signature Handler
+    }
+}

DigitalData.Core.Security/AsymCryptService.cs

@@ -1,70 +0,0 @@
-using DigitalData.Core.Abstractions.Security;
-using DigitalData.Core.Security.Config;
-using DigitalData.Core.Security.Cryptographer;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System.Collections;
-
-namespace DigitalData.Core.Security
-{
-    public class AsymCryptService<TAsymCryptParams> : RSAFactory<TAsymCryptParams>, IAsymCryptService<TAsymCryptParams>, IRSAFactory<TAsymCryptParams>, IEnumerable<IRSADecryptor>
-        where TAsymCryptParams : AsymCryptParams
-    {
-        public IEnumerable<IRSADecryptor> Decryptors { get; }
-        
-        /// <summary>
-        /// It is a separate decryptor for permanently stored encrypted data. It is assigned to the first Default decryptor by default.
-        /// </summary>
-        public IRSADecryptor Vault { get; }
-
-        public IRSADecryptor this[string key]
-        {
-            get
-            {
-                var key_params = key.Split(_params.KeyNameSeparator);
-
-                if (key_params.Length != 2)
-                    throw new ArgumentException($"Invalid key format. Expected two segments separated by '{_params.KeyNameSeparator}', but received: '{key}'.", nameof(key));
-
-                return _params.Decryptors.FirstOrDefault(d => d.Issuer == key_params[0] && d.Audience == key_params[1])
-                    ?? throw new KeyNotFoundException($"No decryptor found matching the issuer '{key_params[0]}' and audience '{key_params[1]}'.");
-            }
-        }
-
-        public IRSADecryptor this[int index] => index < 0 || index >= Decryptors.Count()
-            ? Decryptors.ElementAt(index)
-            : throw new ArgumentOutOfRangeException(
-                nameof(index),
-                index,
-                $"The index {index} is out of range. The valid indices for {GetType()} are between 0 and {Decryptors.Count() - 1} (inclusive). Please ensure the index is within this range.");
-
-        public AsymCryptService(IOptions<TAsymCryptParams> options, ILogger<AsymCryptService<TAsymCryptParams>>? logger = null) : base(options)
-        {
-            logger?.LogInformation("Core.Secrets version: {Version}, Created on: {CreationDate}.", Secrets.Version, Secrets.CreationDate.ToString("dd.MM.yyyy"));
-
-            if (!_params.Decryptors.Any())
-                throw new InvalidOperationException(
-                    "Any decryptor is not found. Ensure that at least one decryptor is configured in the provided parameters. " +
-                    "This issue typically arises if the configuration for decryptors is incomplete or missing. " +
-                    "Check the 'Decryptors' collection in the configuration and verify that it contains valid entries."
-                );
-
-            Decryptors = _params.Decryptors;
-
-            Vault = _params.Vault ?? Decryptors.First();
-        }
-
-        public IEnumerator<IRSADecryptor> GetEnumerator() => Decryptors.GetEnumerator();
-
-        IEnumerator IEnumerable.GetEnumerator() => Decryptors.GetEnumerator();
-
-        public IEnumerable<IRSAEncryptor> Encryptors
-        {
-            get
-            {
-                foreach (var decryptor in Decryptors)
-                    yield return decryptor.Encryptor;
-            }
-        }
-    }
-}

DigitalData.Core.Security/Config/CryptoFactoryParams.cs

@@ -1,9 +1,8 @@
-using DigitalData.Core.Abstractions.Security;
-using DigitalData.Core.Security.Cryptographer;
+using DigitalData.Core.Security.RSAKey;
 
 namespace DigitalData.Core.Security.Config
 {
-    public class AsymCryptParams : RSAFactoryParams
+    public class CryptoFactoryParams : RSAFactoryParams
     {
         public string PemDirectory { get; init; } = string.Empty;
 
@@ -23,20 +22,6 @@ namespace DigitalData.Core.Security.Config
 
         public string FileExtension { get; init; } = "pem";
 
-        /// <summary>
-        /// Represents the separator used to concatenate the components of a key-related token string.
-        /// </summary>
-        /// <remarks>
-        /// The resulting key-related token string is constructed as follows:
-        /// <c>string.Join(KeyNameSeparator, Issuer, Audience, Secret_version)</c>.
-        /// If <c>Secret_version</c> is not null, it will be included in the concatenation.
-        /// </remarks>
-        /// <example>
-        /// For example, if <c>KeyNameSeparator = ":"</c>, the output might look like:
-        /// <c>"Issuer:Audience:Secret_version"</c>.
-        /// </example>
-        public string KeyNameSeparator { get; init; } = ":";
-
         /// <summary>
         ///This is the subtext of the pem file name. For the file to be automatically renewed, the name must be assigned to change periodically. For example, by default MM/2 will be refreshed every 2 months.
         /// <br />
@@ -56,11 +41,11 @@ namespace DigitalData.Core.Security.Config
 
         public IEnumerable<RSADecryptor> Decryptors { get; init; } = new List<RSADecryptor>();
 
-        public IEnumerable<TokenDescription> TokenDescriptions { get; init; } = new List<TokenDescription>();
+        public IEnumerable<RSATokenDescriptor> TokenDescriptors { get; init; } = new List<RSATokenDescriptor>();
 
-        public RSADecryptor? Vault { get; init; }
+        public RSADecryptor? VaultDecryptor { get; init; }
 
-        public AsymCryptParams()
+        public CryptoFactoryParams()
         {
             // init decryptors
             AfterCreate += () =>
@@ -69,13 +54,29 @@ namespace DigitalData.Core.Security.Config
                 if (!Directory.Exists(PemDirectory))
                     Directory.CreateDirectory(PemDirectory);
 
-                foreach (var decryptor in Decryptors)
+                var privateKeys = new List<RSAPrivateKey>();
+                privateKeys.AddRange(Decryptors);
+                privateKeys.AddRange(TokenDescriptors);
+                if (VaultDecryptor is not null)
+                    privateKeys.Add(VaultDecryptor);
+
+                foreach (var privateKey in privateKeys)
                 {
                     // set default path
-                    if (decryptor.IsPemNull)
+                    if (privateKey.IsPemNull)
                     {
-                        var file_name_params = new List<object> { decryptor.Issuer, decryptor.Audience, KeySizeInBits, DateTime.Now.ToTag(DateTagFormat) };
-                        if (decryptor.IsEncrypted)
+                        // file name 
+                        var file_name_params = new List<object>();
+
+                        if (privateKey.Id is not null)
+                            file_name_params.Add(privateKey.Id);
+                        else if (privateKey is RSATokenDescriptor descriptor)
+                            file_name_params.Add(descriptor.Issuer);
+
+                        file_name_params.Add(KeySizeInBits);
+                        file_name_params.Add(DateTime.Now.ToTag(DateTagFormat));
+
+                        if (privateKey.IsEncrypted)
                             file_name_params.Add(Secrets.Version);
 
                         var file_name = $"{string.Join(FileNameSeparator, file_name_params)}.{FileExtension}";
@@ -83,14 +84,14 @@ namespace DigitalData.Core.Security.Config
                         var path = Path.Combine(PemDirectory, file_name);
 
                         if (File.Exists(path))
-                            decryptor.SetPem(File.ReadAllText(path));
+                            privateKey.SetPem(File.ReadAllText(path));
                         else
                         {
-                            var pem = decryptor.IsEncrypted
+                            var pem = privateKey.IsEncrypted
                                 ? Instance.RSAFactory.CreateEncryptedPrivateKeyPem(pbeParameters: PbeParameters, keySizeInBits: KeySizeInBits, password: Secrets.PBE_PASSWORD)
                                 : Instance.RSAFactory.CreatePrivateKeyPem(keySizeInBits: KeySizeInBits);
 
-                            decryptor.SetPem(pem);
+                            privateKey.SetPem(pem);
 
                             // Save file in background
                             Task.Run(async () => await File.WriteAllTextAsync(path: path, pem));
@@ -98,19 +99,6 @@ namespace DigitalData.Core.Security.Config
                     }
                 }
             };
-
-            // set signing credentials of token descriptions
-            AfterCreate += () =>
-            {
-                foreach(var tDesc in TokenDescriptions)
-                {
-                    if (!Decryptors.TryGet(issuer: tDesc.Issuer, tDesc.Audience, out var decryptor) || decryptor is null)
-                        throw new InvalidOperationException(
-                            $"Decryptor for Issuer '{tDesc.Issuer}' and Audience '{tDesc.Audience}' could not be found or is null.");
-
-                    tDesc.SigningCredentials = decryptor.CreateSigningCredentials(algorithm: tDesc.SigningAlgorithm, digest: tDesc.SigningDigest);
-                }
-            };
         }
     }
 }

DigitalData.Core.Security/Config/MappingProfile.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using DigitalData.Core.Abstractions.Security;
 using Microsoft.IdentityModel.Tokens;
 
 namespace DigitalData.Core.Security.Config
@@ -7,7 +8,7 @@ namespace DigitalData.Core.Security.Config
     {
         public MappingProfile()
         {
-            CreateMap<TokenDescription, SecurityTokenDescriptor>();
+            CreateMap<IAsymmetricTokenDescriptor, SecurityTokenDescriptor>();
         }
     }
 }

DigitalData.Core.Security/CryptoFactory.cs

@@ -0,0 +1,38 @@
+using DigitalData.Core.Abstractions.Security;
+using DigitalData.Core.Security.Config;
+using DigitalData.Core.Security.RSAKey;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+ 
+namespace DigitalData.Core.Security
+{
+    public class CryptoFactory : RSAFactory<CryptoFactoryParams>, ICryptoFactory, IAsymmetricKeyFactory
+    {
+        public IEnumerable<IAsymmetricDecryptor> Decryptors { get; }
+        
+        /// <summary>
+        /// It is a separate decryptor for permanently stored encrypted data. It is assigned to the first Default decryptor by default.
+        /// </summary>
+        public IAsymmetricDecryptor VaultDecryptor { get; }
+
+        public IEnumerable<IAsymmetricTokenDescriptor> TokenDescriptors { get; init; } = new List<IAsymmetricTokenDescriptor>();
+
+        public CryptoFactory(IOptions<CryptoFactoryParams> options, ILogger<CryptoFactory>? logger = null) : base(options)
+        {
+            logger?.LogInformation("Core.Secrets version: {Version}, Created on: {CreationDate}.", Secrets.Version, Secrets.CreationDate.ToString("dd.MM.yyyy"));
+
+            if (!_params.Decryptors.Any())
+                throw new InvalidOperationException(
+                    "Any decryptor is not found. Ensure that at least one decryptor is configured in the provided parameters. " +
+                    "This issue typically arises if the configuration for decryptors is incomplete or missing. " +
+                    "Check the 'Decryptors' collection in the configuration and verify that it contains valid entries."
+                );
+
+            Decryptors = _params.Decryptors;
+
+            TokenDescriptors = _params.TokenDescriptors;
+
+            VaultDecryptor = _params.VaultDecryptor ?? Decryptors.First();
+        }
+    }
+}

DigitalData.Core.Security/Cryptographer/RSACryptographer.cs

@@ -1,39 +0,0 @@
-using DigitalData.Core.Abstractions.Security;
-using Microsoft.IdentityModel.Tokens;
-using System.Reflection;
-using System.Security.Cryptography;
-
-namespace DigitalData.Core.Security.Cryptographer
-{
-    //TODO: Abstract RSA for future updates (using ECC, El Gamal or Lattice-based Cryptography)
-    public class RSACryptographer : IRSACryptographer
-    {
-        public virtual string Pem { get; init; }
-                
-        public RSAEncryptionPadding Padding { get; init; } = RSAEncryptionPadding.OaepSHA256;
-
-        // TODO: add as json converter to IConfigurIConfiguration.Config
-        public string PaddingName
-        {
-            get => Padding.ToString();
-            init => Padding = typeof(RSAEncryptionPadding).GetProperty(value, BindingFlags.Public | BindingFlags.Static)?.GetValue(null) as RSAEncryptionPadding ?? throw new ArgumentException($"Padding '{value}' not found.");
-        }
-
-        protected virtual RSA RSA { get; } = RSA.Create();
-
-        public string Issuer { get; init; } = string.Empty;
-
-        public string Audience { get; init; } = string.Empty;
-
-        private readonly Lazy<RsaSecurityKey> _lazyRsaSecurityKey;
-
-        public RsaSecurityKey RsaSecurityKey => _lazyRsaSecurityKey.Value;
-
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-        internal RSACryptographer()
-        {
-            _lazyRsaSecurityKey = new(() => new RsaSecurityKey(RSA));
-        }
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-    }
-}

DigitalData.Core.Security/Cryptographer/RSADecryptor.cs

@@ -1,67 +0,0 @@
-using DigitalData.Core.Abstractions.Security;
-using DigitalData.Core.Security.Config;
-using Microsoft.IdentityModel.Tokens;
-using System.Security.Cryptography;
-
-namespace DigitalData.Core.Security.Cryptographer
-{
-    public class RSADecryptor : RSACryptographer, IRSADecryptor, IRSACryptographer
-    {
-        private string? _pem;
-
-        public override string Pem
-        {
-#pragma warning disable CS8603 // Possible null reference return.
-            get => _pem;
-#pragma warning restore CS8603 // Possible null reference return.
-            init
-            {
-                _pem = value;
-                Init();
-            }
-        }
-
-        public bool IsPemNull => _pem is null;
-
-        public bool IsEncrypted { get; init; }
-
-        private readonly Lazy<IRSAEncryptor> _lazyEncryptor;
-
-        public IRSAEncryptor Encryptor => _lazyEncryptor.Value;
-
-        public RSADecryptor()
-        {
-            _lazyEncryptor = new(() => new RSAEncryptor()
-            {
-                Pem = RSA.ExportRSAPublicKeyPem(),
-                Padding = Padding
-            });
-        }
-
-        public byte[] Decrypt(byte[] data) => RSA.Decrypt(data, Padding);
-
-        public string Decrypt(string data) => RSA.Decrypt(data.Base64ToByte(), Padding).BytesToString();
-
-        internal void SetPem(string pem)
-        {
-            _pem = pem;
-            Init();
-        }
-
-        private void Init()
-        {
-            if (string.IsNullOrEmpty(_pem))
-                throw PemIsNullException;
-
-            if (IsEncrypted)
-                RSA.ImportFromEncryptedPem(Pem, Secrets.PBE_PASSWORD.AsSpan());
-            else
-                RSA.ImportFromPem(Pem);
-        }
-
-        private InvalidOperationException PemIsNullException => new($"Pem is null or empty. Issuer: {Issuer}, Audience: {Audience}.");
-
-        public SigningCredentials CreateSigningCredentials(string algorithm = SecurityAlgorithms.RsaSha256, string? digest = null)
-            => digest is null ? new(RsaSecurityKey, algorithm) : new(RsaSecurityKey, algorithm, digest);
-    }
-}

DigitalData.Core.Security/Cryptographer/RSAEncryptor.cs

@@ -1,24 +0,0 @@
-using DigitalData.Core.Abstractions.Security;
-using DigitalData.Core.Security.Config;
-
-namespace DigitalData.Core.Security.Cryptographer
-{
-    public class RSAEncryptor : RSACryptographer, IRSAEncryptor, IRSACryptographer
-    {
-        public override string Pem 
-        {
-            get => base.Pem;
-            init
-            {
-                base.Pem = value;
-                RSA.ImportFromPem(value);
-            }
-        }
-
-        public byte[] Encrypt(byte[] data) => RSA.Encrypt(data, Padding);
-
-        public string Encrypt(string data) => RSA.Encrypt(data.ToBytes(), Padding).ToBase64String();
-
-        public bool Verify(string data, string signature) => Encrypt(data) == signature;
-    }
-}

DigitalData.Core.Security/DIExtensions.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstractions.Security;
 using DigitalData.Core.Security.Config;
-using DigitalData.Core.Security.Cryptographer;
+using DigitalData.Core.Security.RSAKey;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -10,122 +10,43 @@ namespace DigitalData.Core.Security
 {
     public static class DIExtensions
     {
-        private static (bool Added, object Lock) _mappingProfile = (false, new());
-        private static IServiceCollection AddMappingProfile(this IServiceCollection services)
-        {
-            if (_mappingProfile.Added)
-                return services;
-
-            lock (_mappingProfile.Lock)
-            {
-                if (_mappingProfile.Added)
-                    return services;
-
-                _mappingProfile.Added = true;
-                return services
-                    .AddAutoMapper(typeof(MappingProfile).Assembly)
-                    .AddSingleton<TokenDescriptorProvider>();
-            }
-        }
-
         private static IServiceCollection AddParamsConfigureOptions<TParams>(this IServiceCollection services) where TParams : RSAFactoryParams
             => services.AddSingleton<IConfigureOptions<TParams>, ParamsConfigureOptions<TParams>>();
 
-        private static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, bool setAsDefault = false) where TAsymCryptParams : AsymCryptParams
-        {
-            services.AddParamsConfigureOptions<TAsymCryptParams>().AddMappingProfile();
-            return setAsDefault
-                ? services.AddSingleton<IAsymCryptService, AsymCryptService<TAsymCryptParams>>()
-                : services.AddSingleton<IAsymCryptService<TAsymCryptParams>, AsymCryptService<TAsymCryptParams>>();
-        }
+        private static IServiceCollection AddCryptoFactory(this IServiceCollection services) => services
+            .AddParamsConfigureOptions<CryptoFactoryParams>()
+            .AddAutoMapper(typeof(MappingProfile).Assembly)
+            .AddSingleton<ICryptoFactory, CryptoFactory>();
 
         /// <summary>
         /// Registers a custom asym crypt service with specified parameters from the given configuration section.
         /// </summary>
-        /// <typeparam name="TAsymCryptParams"></typeparam>
         /// <param name="services"></param>
         /// <param name="section"></param>
-        /// <param name="setAsDefault">If true, the factory is registered as the default <see cref="IRSAFactory"/>. Otherwise, it is registered as <see cref="IRSAFactory{TRSAFactoryParams}"/>.</param>
-        /// <returns></returns>
-        public static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, IConfigurationSection section, bool setAsDefault = false) where TAsymCryptParams : AsymCryptParams => services
-            .Configure<TAsymCryptParams>(section)
-            .AddAsymCryptService<TAsymCryptParams>(setAsDefault: setAsDefault);
-
-        /// <summary>
-        /// Registers a custom asym crypt service with default parameters from the given configuration section.
-        /// </summary>
-        /// <param name="services"></param>
-        /// <param name="section"></param>
-        /// <param name="setAsDefault"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddAsymCryptService(this IServiceCollection services, IConfigurationSection section, bool setAsDefault = false)
-            => services.Configure<AsymCryptParams>(section).AddAsymCryptService<AsymCryptParams>(setAsDefault: setAsDefault);
-
-        /// <summary>
-        /// Registers an asym crypt service with the specified parameters from the given instance. Optionally, sets it as the default factory.
-        /// </summary>
-        /// <typeparam name="TAsymCryptParams"></typeparam>
-        /// <param name="services"></param>
-        /// <param name="param"></param>
-        /// <param name="setAsDefault">If true, the factory is registered as the default <see cref="IRSAFactory"/>. Otherwise, it is registered as <see cref="IRSAFactory{TRSAFactoryParams}"/>.</param>
-        /// <returns></returns>
-        public static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, TAsymCryptParams param, bool setAsDefault = false) where TAsymCryptParams : AsymCryptParams => services
-            .AddSingleton(Options.Create(param))
-            .AddAsymCryptService<TAsymCryptParams>(setAsDefault: setAsDefault);
-
-        /// <summary>
-        /// Registers default asym crypt service with the specified parameters from the given instance.
-        /// </summary>
-        /// <param name="services"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddAsymCryptService(this IServiceCollection services, AsymCryptParams param) => services
-            .AddAsymCryptService(param: param, setAsDefault: true);
-
-        /// <summary>
-        /// Registers default RSA Factory instance with default params
-        /// </summary>
-        /// <param name="services"></param>
-        /// <param name="factoryParams"></param>
         /// <returns>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
-        public static IServiceCollection AddRSAFactory(this IServiceCollection services, RSAFactoryParams? factoryParams = null) => services
-            .AddParamsConfigureOptions<RSAFactoryParams>()
-            .AddMappingProfile()
-            .AddScoped<IRSAFactory>(_ => new RSAFactory<RSAFactoryParams>(Options.Create(factoryParams ?? new())));
+        public static IServiceCollection AddCryptoFactory(this IServiceCollection services, IConfigurationSection section) => services
+            .Configure<CryptoFactoryParams>(section)
+            .AddCryptoFactory();
+
+        /// <summary>
+        /// Registers an asym crypt service with the specified parameters from the given instance.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
+        public static IServiceCollection AddCryptoFactory(this IServiceCollection services, CryptoFactoryParams? factoryParams = null) => services
+            .AddSingleton(Options.Create(factoryParams ?? new()))
+            .AddCryptoFactory();
 
         /// <summary>
         /// Registers a custom RSA Factory with specified parameters from the given configuration section.
         /// </summary>
-        /// <typeparam name="TRSAFactoryParams"></typeparam>
         /// <param name="services"></param>
         /// <param name="section"></param>
-        /// <param name="setAsDefault">If true, the factory is registered as the default <see cref="IRSAFactory"/>. Otherwise, it is registered as <see cref="IRSAFactory{TRSAFactoryParams}"/>.</param>
         /// <returns>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
-        public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, IConfigurationSection section, bool setAsDefault = false)
-            where TRSAFactoryParams : RSAFactoryParams
-        {
-            services.AddMappingProfile().AddParamsConfigureOptions<TRSAFactoryParams>().Configure<TRSAFactoryParams>(section);
-            return setAsDefault
-                ? services.AddSingleton<IRSAFactory, RSAFactory<TRSAFactoryParams>>()
-                : services.AddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
-        }
-
-        /// <summary>
-        /// Registers an RSA Factory with the specified parameters from the given instance. Optionally, sets it as the default factory.
-        /// </summary>
-        /// <typeparam name="TRSAFactoryParams">The type of the RSA factory parameters.</typeparam>
-        /// <param name="services"></param>
-        /// <param name="rsaParams"></param>
-        /// <param name="setAsDefault">If true, the factory is registered as the default <see cref="IRSAFactory"/>. Otherwise, it is registered as <see cref="IRSAFactory{TRSAFactoryParams}"/>.</param>
-        /// <returns>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
-        public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, TRSAFactoryParams rsaParams, bool setAsDefault = false)
-            where TRSAFactoryParams : RSAFactoryParams
-        {
-            services.AddMappingProfile().AddSingleton(Options.Create(rsaParams));
-            return setAsDefault
-                ? services.AddParamsConfigureOptions<TRSAFactoryParams>().AddSingleton<IRSAFactory, RSAFactory<TRSAFactoryParams>>()
-                : services.AddParamsConfigureOptions<TRSAFactoryParams>().AddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
-        }
+        public static IServiceCollection AddRSAFactory(this IServiceCollection services, IConfigurationSection section) => services
+            .AddParamsConfigureOptions<RSAFactoryParams>()
+            .Configure<RSAFactoryParams>(section)
+            .AddSingleton<IAsymmetricKeyFactory, RSAFactory<RSAFactoryParams>>();
 
         private static IServiceCollection AddClaimDescriptor<TPrincipal>(this IServiceCollection services,
             Func<TPrincipal, IDictionary<string, object>>? claimsMapper = null,
@@ -139,5 +60,12 @@ namespace DigitalData.Core.Security
 
             return services.AddSingleton(sp => Options.Create(descriptor));
         }
+
+        public static IServiceCollection AddJwtSignatureHandler<TPrincipal>(this IServiceCollection services,
+            Func<TPrincipal, IDictionary<string, object>>? claimsMapper = null,
+            Func<TPrincipal, ClaimsIdentity>? subjectMapper = null)
+            => services
+                .AddClaimDescriptor(claimsMapper: claimsMapper, subjectMapper: subjectMapper)
+                .AddSingleton<IJwtSignatureHandler<TPrincipal>, JwtSignatureHandler<TPrincipal>>();
     }
 }

DigitalData.Core.Security/DigitalData.Core.Security.csproj

@@ -4,8 +4,28 @@
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <PackageId>DigitalData.Core.Security</PackageId>
+    <Version>1.0.0</Version>
+    <Company>Digital Data GmbH</Company>
+    <Product>Digital Data GmbH</Product>
+    <Description>This package provides RSA-based security functionalities as an implementation of the DigitalData.Core.Abstractions.Security library. It supports robust encryption and decryption operations, as well as JWT signing and validation for secure authentication and data integrity.</Description>
+    <Authors>Digital Data GmbH</Authors>
+    <Copyright>Copyright 2025</Copyright>
+    <PackageProjectUrl></PackageProjectUrl>
+    <PackageIcon>core_icon.png</PackageIcon>
+    <RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
+    <PackageTags>digital data core security</PackageTags>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\nuget-package-icons\core_icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />

DigitalData.Core.Security/Extension.cs

@@ -1,15 +1,11 @@
-namespace DigitalData.Core.Security.Config
+using AutoMapper;
+using DigitalData.Core.Abstractions.Security;
+using Microsoft.IdentityModel.Tokens;
+
+namespace DigitalData.Core.Security
 {
-    internal static class StringExtensions
+    internal static class Extension
     {
-        public static string ToBase64String(this byte[] bytes) => Convert.ToBase64String(bytes);
-
-        public static byte[] Base64ToByte(this string base64String) => Convert.FromBase64String(base64String);
-
-        public static byte[] ToBytes(this string str) => System.Text.Encoding.UTF8.GetBytes(str);
-
-        public static string BytesToString(this byte[] bytes) => System.Text.Encoding.UTF8.GetString(bytes);
-
         /// <summary>
         /// Converts a <see cref="DateTime"/> to a formatted string based on the specified format string.
         /// <br />
@@ -30,7 +26,7 @@
         /// <exception cref="ArgumentException">Thrown if the format string is invalid, such as having an incorrect number of parts after "//".</exception>
         /// <exception cref="DivideByZeroException">Thrown if the right side of the "//" contains a zero, resulting in division by zero.</exception>
         /// <exception cref="FormatException">Thrown if either the left-side or right-side value of "//" cannot be parsed as an integer.</exception>
-        public static string ToTag(this DateTime date, string format)
+        internal static string ToTag(this DateTime date, string format)
         {
             if (format is not null && format.Contains("//"))
             {
@@ -78,6 +74,16 @@
         /// <exception cref="ArgumentException">Thrown if the format string is invalid, such as having an incorrect number of parts after "//".</exception>
         /// <exception cref="DivideByZeroException">Thrown if the right side of the "//" contains a zero, resulting in division by zero.</exception>
         /// <exception cref="FormatException">Thrown if either the left-side or right-side value of "//" cannot be parsed as an integer.</exception>
-        public static string ToTag(this DateOnly date, string format) => date.ToDateTime(new()).ToTag(format);
+        internal static string ToTag(this DateOnly date, string format) => date.ToDateTime(new()).ToTag(format);
+
+        /// <summary>
+        /// Maps a <see cref="RSATokenDescriptor"/> to a <see cref="SecurityTokenDescriptor"/>.
+        /// </summary>
+        /// <param name="mapper">The <see cref="IMapper"/> instance used for mapping.</param>
+        /// <param name="description">The <see cref="RSATokenDescriptor"/> instance to be mapped.</param>
+        /// <returns>A <see cref="SecurityTokenDescriptor"/> instance populated with the mapped values.</returns>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="mapper"/> or <paramref name="description"/> is <c>null</c>.</exception>
+        internal static SecurityTokenDescriptor Map(this IMapper mapper, IAsymmetricTokenDescriptor description)
+            => mapper.Map(description, new SecurityTokenDescriptor());
     }
 }

DigitalData.Core.Security/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0290:Use primary constructor", Justification = "<Pending>", Scope = "member", Target = "~M:DigitalData.Core.Security.JwtSignatureHandler`1.#ctor(Microsoft.Extensions.Options.IOptions{DigitalData.Core.Security.Config.ClaimDescriptor{`0}},AutoMapper.IMapper)")]

DigitalData.Core.Security/Instance.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstractions.Security;
 using DigitalData.Core.Security.Config;
-using DigitalData.Core.Security.Cryptographer;
+using DigitalData.Core.Security.RSAKey;
 using Microsoft.Extensions.Options;
 
 namespace DigitalData.Core.Security
@@ -9,6 +9,6 @@ namespace DigitalData.Core.Security
     {
         private static readonly Lazy<RSAFactory<RSAFactoryParams>> LazyInstance = new(() => new(Options.Create<RSAFactoryParams>(new())));
 
-        public static IRSAFactory RSAFactory => LazyInstance.Value;
+        public static IAsymmetricKeyFactory RSAFactory => LazyInstance.Value;
     }
 }

DigitalData.Core.Security/JwtSignatureHandler.cs

@@ -0,0 +1,40 @@
+using AutoMapper;
+using DigitalData.Core.Abstractions.Security;
+using DigitalData.Core.Security.Config;
+using Microsoft.Extensions.Options;
+using Microsoft.IdentityModel.Tokens;
+using System.IdentityModel.Tokens.Jwt;
+
+namespace DigitalData.Core.Security
+{
+    public class JwtSignatureHandler<TPrincipal> : JwtSecurityTokenHandler, IJwtSignatureHandler<TPrincipal>
+    {
+        private readonly ClaimDescriptor<TPrincipal> _claimDescriptor;
+
+        private readonly IMapper _mapper;
+
+        private readonly ICryptoFactory _cryptoFactory;
+
+        public JwtSignatureHandler(IOptions<ClaimDescriptor<TPrincipal>> claimDescriptorOptions, IMapper mapper, ICryptoFactory cryptoFactory)
+        {
+            _claimDescriptor = claimDescriptorOptions.Value;
+            _mapper = mapper;
+            _cryptoFactory = cryptoFactory;
+        }
+
+        public SecurityToken CreateToken(TPrincipal subject, IAsymmetricTokenDescriptor descriptor)
+        {
+            var sDescriptor = _mapper.Map(descriptor);
+            sDescriptor.Claims = _claimDescriptor.CreateClaims?.Invoke(subject);
+            sDescriptor.Subject = _claimDescriptor.CreateSubject?.Invoke(subject);
+            return CreateToken(sDescriptor);
+        }
+
+        public SecurityToken CreateToken(TPrincipal subject, string issuer, string audience)
+        {
+            var descriptor = _cryptoFactory.TokenDescriptors.Get(issuer: issuer, audience: audience)
+                ?? throw new InvalidOperationException($"No or multiple token description found for issuer '{issuer}' and audience '{audience}'.");
+            return CreateToken(subject: subject, descriptor: descriptor);
+        }
+    }
+}

DigitalData.Core.Security/JwtSignatureService.cs

@@ -1,30 +0,0 @@
-using DigitalData.Core.Security.Config;
-using Microsoft.Extensions.Options;
-using Microsoft.IdentityModel.Tokens;
-using System.IdentityModel.Tokens.Jwt;
-
-namespace DigitalData.Core.Security
-{
-    public class JwtSignatureService<TPrincipal> : JwtSecurityTokenHandler
-    {
-        private readonly ClaimDescriptor<TPrincipal> _claimDescriptor;
-
-        private readonly TokenDescriptorProvider _descriptorProvider;
-
-        public JwtSignatureService(IOptions<ClaimDescriptor<TPrincipal>> claimDescriptorOptions, TokenDescriptorProvider descriptorProvider)
-        {
-            _claimDescriptor = claimDescriptorOptions.Value;
-            _descriptorProvider = descriptorProvider;
-        }
-
-        public SecurityToken CreateToken(TPrincipal subject, TokenDescription description)
-        {
-            var descriptor = _descriptorProvider.Create(description: description);
-            descriptor.Claims = _claimDescriptor.CreateClaims?.Invoke(subject);
-            descriptor.Subject = _claimDescriptor.CreateSubject?.Invoke(subject);
-            return CreateToken(descriptor);
-        }
-
-        public string CreateAndWriteToken(TPrincipal subject, TokenDescription description) => WriteToken(CreateToken(subject, description));
-    }
-}

DigitalData.Core.Security/RSAKey/RSADecryptor.cs

@@ -0,0 +1,33 @@
+using DigitalData.Core.Abstractions.Security;
+using System.Reflection;
+using System.Security.Cryptography;
+
+namespace DigitalData.Core.Security.RSAKey
+{
+    public class RSADecryptor : RSAPrivateKey, IAsymmetricDecryptor
+    {
+        public RSAEncryptionPadding Padding { get; init; } = RSAEncryptionPadding.OaepSHA256;
+
+        // TODO: add as json converter to IConfigurIConfiguration.Config
+        public string PaddingName
+        {
+            get => Padding.ToString();
+            init => Padding = typeof(RSAEncryptionPadding).GetProperty(value, BindingFlags.Public | BindingFlags.Static)?.GetValue(null) as RSAEncryptionPadding ?? throw new ArgumentException($"Padding '{value}' not found.");
+        }
+
+        public byte[] Decrypt(byte[] data) => RSA.Decrypt(data, Padding);
+
+        private readonly Lazy<IAsymmetricEncryptor> _lazyEncryptor;
+
+        public IAsymmetricEncryptor Encryptor => _lazyEncryptor.Value;
+
+        public RSADecryptor()
+        {
+            _lazyEncryptor = new(() => new RSAEncryptor()
+            {
+                Content = RSA.ExportRSAPublicKeyPem(),
+                Padding = Padding
+            });
+        }
+    }
+}

DigitalData.Core.Security/RSAKey/RSAEncryptor.cs

@@ -0,0 +1,20 @@
+using DigitalData.Core.Abstractions.Security;
+using System.Reflection;
+using System.Security.Cryptography;
+
+namespace DigitalData.Core.Security.RSAKey
+{
+    public class RSAEncryptor : RSAPublicKey, IAsymmetricEncryptor
+    {
+        public RSAEncryptionPadding Padding { get; init; } = RSAEncryptionPadding.OaepSHA256;
+
+        // TODO: add as json converter to IConfigurIConfiguration.Config
+        public string PaddingName
+        {
+            get => Padding.ToString();
+            init => Padding = typeof(RSAEncryptionPadding).GetProperty(value, BindingFlags.Public | BindingFlags.Static)?.GetValue(null) as RSAEncryptionPadding ?? throw new ArgumentException($"Padding '{value}' not found.");
+        }
+
+        public byte[] Encrypt(byte[] data) => RSA.Encrypt(data, Padding);
+    }
+}

DigitalData.Core.Security/RSAKey/RSAFactory.cs

@@ -3,9 +3,9 @@ using DigitalData.Core.Security.Config;
 using Microsoft.Extensions.Options;
 using System.Security.Cryptography;
 
-namespace DigitalData.Core.Security.Cryptographer
+namespace DigitalData.Core.Security.RSAKey
 {
-    public class RSAFactory<TRSAFactoryParams> : IRSAFactory<TRSAFactoryParams> where TRSAFactoryParams : RSAFactoryParams
+    public class RSAFactory<TRSAFactoryParams> : IAsymmetricKeyFactory where TRSAFactoryParams : RSAFactoryParams
     {
         protected readonly TRSAFactoryParams _params;
 
@@ -56,11 +56,9 @@ namespace DigitalData.Core.Security.Cryptographer
             return new string(pemChars);
         }
 
-        public IRSADecryptor CreateDecryptor(string pem, string? issuer = null, string? audience = null, bool encrypt = false, RSAEncryptionPadding? padding = null) => new RSADecryptor()
+        public IAsymmetricDecryptor CreateDecryptor(string pem, string? issuer = null, string? audience = null, bool encrypt = false, RSAEncryptionPadding? padding = null) => new RSADecryptor()
         {
-            Pem = pem,
-            Issuer = issuer ?? string.Empty,
-            Audience = audience ?? string.Empty,
+            Content = pem,
             IsEncrypted = encrypt,
             Padding = padding ?? RSAEncryptionPadding.OaepSHA256
         };

DigitalData.Core.Security/RSAKey/RSAKeyBase.cs

@@ -0,0 +1,16 @@
+using DigitalData.Core.Abstractions.Security;
+using System.Security.Cryptography;
+
+namespace DigitalData.Core.Security.RSAKey
+{
+    public class RSAKeyBase : IAsymmetricKey
+    {
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        public virtual string Content { get; init; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
+        public string? Id { get; init; }
+
+        protected virtual RSA RSA { get; } = RSA.Create();
+    }
+}

DigitalData.Core.Security/RSAKey/RSAPrivateKey.cs

@@ -0,0 +1,55 @@
+using DigitalData.Core.Abstractions.Security;
+using System.Security.Cryptography;
+
+namespace DigitalData.Core.Security.RSAKey
+{
+    public class RSAPrivateKey : RSAKeyBase, IAsymmetricPrivateKey, IAsymmetricKey
+    {
+        private string? _pem;
+
+        public override string Content
+        {
+#pragma warning disable CS8603 // Possible null reference return.
+            get => _pem;
+#pragma warning restore CS8603 // Possible null reference return.
+            init
+            {
+                _pem = value;
+                Init();
+            }
+        }
+
+        public bool IsPemNull => _pem is null;
+
+        public bool IsEncrypted { get; init; }
+
+        protected TPublicKey CreatePublicKey<TPublicKey>() where TPublicKey : RSAPublicKey, new()
+            => new() { Content = RSA.ExportRSAPublicKeyPem() };
+
+        private readonly Lazy<RSAPublicKey> _lazyPublicKey;
+
+        public IAsymmetricPublicKey PublicKey => _lazyPublicKey.Value;
+
+        public RSAPrivateKey()
+        {
+            _lazyPublicKey = new(CreatePublicKey<RSAPublicKey>);
+        }
+
+        internal void SetPem(string pem)
+        {
+            _pem = pem;
+            Init();
+        }
+
+        private void Init()
+        {
+            if (string.IsNullOrEmpty(_pem))
+                throw new InvalidOperationException ($"The content of RSA private key is null or empty. Id: {Id}.");
+
+            if (IsEncrypted)
+                RSA.ImportFromEncryptedPem(Content, Secrets.PBE_PASSWORD.AsSpan());
+            else
+                RSA.ImportFromPem(Content);
+        }
+    }
+}

DigitalData.Core.Security/RSAKey/RSAPublicKey.cs

@@ -0,0 +1,17 @@
+using DigitalData.Core.Abstractions.Security;
+
+namespace DigitalData.Core.Security.RSAKey
+{
+    public class RSAPublicKey : RSAKeyBase, IAsymmetricPublicKey, IAsymmetricKey
+    {
+        public override string Content 
+        {
+            get => base.Content;
+            init
+            {
+                base.Content = value;
+                RSA.ImportFromPem(value);
+            }
+        }
+    }
+}

DigitalData.Core.Security/RSAKey/RSATokenDescriptor.cs

@@ -1,16 +1,24 @@
-using Microsoft.IdentityModel.Tokens;
+using DigitalData.Core.Abstractions.Security;
+using Microsoft.IdentityModel.Tokens;
 
-namespace DigitalData.Core.Security.Config
+namespace DigitalData.Core.Security.RSAKey
 {
     /// <summary>
     /// Contains some information which used to create a security token. Designed to abstract <see cref="SecurityTokenDescriptor"/>
     /// </summary>
-    public class TokenDescription
+    public class RSATokenDescriptor : RSAPrivateKey, IAsymmetricTokenDescriptor
     {
+        private readonly Lazy<RSATokenValidator> _lazyTokenValidator;
+
+        public IAsymmetricTokenValidator Validator => _lazyTokenValidator.Value;
+
+        public required TimeSpan Lifetime { get; init; }
+
+        #region SecurityTokenDescriptor Map
         /// <summary>
         /// Gets or sets the value of the 'audience' claim.
         /// </summary>
-        public string Audience { get; set; }
+        public required string Audience { get; set; }
 
         /// <summary>
         /// Defines the compression algorithm that will be used to compress the JWT token payload.
@@ -24,13 +32,14 @@ namespace DigitalData.Core.Security.Config
 
         /// <summary>
         /// Gets or sets the value of the 'expiration' claim. This value should be in UTC.
+        /// The expiration time is the sum of DateTime.Now and LifeTime.
         /// </summary>
-        public DateTime? Expires { get; set; }
+        public DateTime? Expires => DateTime.Now.AddTicks(Lifetime.Ticks);
 
         /// <summary>
-        /// Gets or sets the issuer of this <see cref="ITokenDescription"/>.
+        /// Gets or sets the issuer of this <see cref="SecurityTokenDescriptor"/>.
         /// </summary>
-        public string Issuer { get; set; }
+        public required string Issuer { get; set; }
 
         /// <summary>
         /// Gets or sets the time the security token was issued. This value should be in UTC.
@@ -73,7 +82,14 @@ namespace DigitalData.Core.Security.Config
         /// <summary>
         /// Gets or sets the <see cref="SigningCredentials"/> used to create a security token.
         /// </summary>
-        public SigningCredentials SigningCredentials { get; set; }
+        public SigningCredentials SigningCredentials => _lazySigningCredentials.Value;
+        #endregion SecurityTokenDescriptor
+
+        private readonly Lazy<RsaSecurityKey> _lazyRsaSecurityKey;
+
+        public SecurityKey SecurityKey => _lazyRsaSecurityKey.Value;
+
+        private readonly Lazy<SigningCredentials> _lazySigningCredentials;
 
         /// <summary>
         /// Specifies the signature algorithm to be applied to the <see cref="SigningCredentials"/>.
@@ -85,6 +101,19 @@ namespace DigitalData.Core.Security.Config
         /// Optionally specifies the digest algorithm to be applied during the signing process for the <see cref="SigningCredentials"/>.
         /// If not provided, the default algorithm is used.
         /// </summary>
-        public string? SigningDigest = null;
+        public string? SigningDigest { get; init; }
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        public RSATokenDescriptor()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        {
+            _lazyTokenValidator = new(CreatePublicKey<RSATokenValidator>);
+
+            _lazyRsaSecurityKey = new(() => new RsaSecurityKey(RSA));
+
+            _lazySigningCredentials = new(() => SigningDigest is null
+                ? new(SecurityKey, SigningAlgorithm)
+                : new(SecurityKey, SigningAlgorithm, SigningDigest));
+        }
     }
-}
+}

DigitalData.Core.Security/RSAKey/RSATokenValidator.cs

@@ -0,0 +1,17 @@
+using DigitalData.Core.Abstractions.Security;
+using Microsoft.IdentityModel.Tokens;
+
+namespace DigitalData.Core.Security.RSAKey
+{
+    public class RSATokenValidator : RSAPublicKey, IAsymmetricTokenValidator
+    {
+        private readonly Lazy<RsaSecurityKey> _lazyRsaSecurityKey;
+
+        public SecurityKey SecurityKey => _lazyRsaSecurityKey.Value;
+
+        public RSATokenValidator()
+        {
+            _lazyRsaSecurityKey = new(() => new RsaSecurityKey(RSA));
+        }
+    }
+}

DigitalData.Core.Security/TokenDescriptorProvider.cs

@@ -1,19 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Security.Config;
-using Microsoft.IdentityModel.Tokens;
-
-namespace DigitalData.Core.Security
-{
-    public class TokenDescriptorProvider
-    {
-        private readonly IMapper _mapper;
-
-        public TokenDescriptorProvider(IMapper mapper)
-        {
-            _mapper = mapper;
-        }
-
-        public SecurityTokenDescriptor Create(TokenDescription description)
-            => _mapper.Map(description, new SecurityTokenDescriptor());
-    }
-}

DigitalData.Core.sln

@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.Core.Security",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.Core.Terminal", "DigitalData.Core.Terminal\DigitalData.Core.Terminal.csproj", "{0FA93730-8084-4907-B172-87D610323796}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.Core.Tests.API", "DigitalData.Core.Tests.API\DigitalData.Core.Tests.API.csproj", "{9BC2DEC5-E89D-48CC-9A51-4D94496EE4A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.Core.Tests.API", "DigitalData.Core.Tests.API\DigitalData.Core.Tests.API.csproj", "{9BC2DEC5-E89D-48CC-9A51-4D94496EE4A6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -68,8 +68,8 @@ Global
 		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47D80C65-74A2-4EB8-96A5-D571A9108FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47D80C65-74A2-4EB8-96A5-D571A9108FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47D80C65-74A2-4EB8-96A5-D571A9108FB3}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{47D80C65-74A2-4EB8-96A5-D571A9108FB3}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{47D80C65-74A2-4EB8-96A5-D571A9108FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47D80C65-74A2-4EB8-96A5-D571A9108FB3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0FA93730-8084-4907-B172-87D610323796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU