IdentityShroud.Api.Tests/Mappers/KeyServiceTests.cs

@@ -11,10 +11,7 @@ namespace IdentityShroud.Api.Tests.Mappers;
 
 public class KeyServiceTests
 {
-    private readonly IDekEncryptionService _dekEncryptionService = EncryptionServiceSubstitute.CreatePassthrough();
+    private readonly NullDekEncryptionService _dekEncryptionService = new(); 
-
-    //private readonly IDataEncryptionService _dataEncryptionService = Substitute.For<IDataEncryptionService>();
-    //private readonly IKeyProviderFactory _keyProviderFactory = Substitute.For<IKeyProviderFactory>();
 
     [Fact]
     public void Test()
@@ -30,7 +27,7 @@ public class KeyServiceTests
         {
             Id = new("60bb79cf-4bac-4521-87f2-ac87cc15541f"),
             KeyType = "RSA",
-            Key = new(EncryptionServiceSubstitute.KeyId, rsa.ExportPkcs8PrivateKey()),
+            Key = new(_dekEncryptionService.KeyId, rsa.ExportPkcs8PrivateKey()),
             CreatedAt = DateTime.UtcNow,
             Priority = 10,
         };

IdentityShroud.Core.Tests/Services/ClientServiceTests.cs

@@ -1,6 +1,5 @@
 using IdentityShroud.Core.Contracts;
 using IdentityShroud.Core.Model;
-using IdentityShroud.Core.Security;
 using IdentityShroud.Core.Services;
 using IdentityShroud.Core.Tests.Fixtures;
 using IdentityShroud.TestUtils.Substitutes;
@@ -11,17 +10,13 @@ namespace IdentityShroud.Core.Tests.Services;
 public class ClientServiceTests : IClassFixture<DbFixture>
 {
     private readonly DbFixture _dbFixture;
-    //private readonly IDekEncryptionService _dekEncryptionService = EncryptionServiceSubstitute.CreatePassthrough();
+    private readonly NullDataEncryptionService _dataEncryptionService = new();
-    private readonly IDataEncryptionService _dataEncryptionService = Substitute.For<IDataEncryptionService>();
     
     private readonly IClock _clock = Substitute.For<IClock>();
     private readonly Guid _realmId = new("a1b2c3d4-0000-0000-0000-000000000001");
 
     public ClientServiceTests(DbFixture dbFixture)
     {
-        _dataEncryptionService.Encrypt(Arg.Any<ReadOnlyMemory<byte>>())
-            .Returns(x => new EncryptedValue(DekId.NewId(), x.ArgAt<ReadOnlyMemory<byte>>(0).ToArray()));
-        
         _dbFixture = dbFixture;
         using Db db = dbFixture.CreateDbContext();
         if (!db.Database.EnsureCreated())

IdentityShroud.Core/Contracts/IDataEncryptionService.cs

@@ -4,6 +4,6 @@ namespace IdentityShroud.Core.Contracts;
 
 public interface IDataEncryptionService
 {
-    EncryptedValue Encrypt(ReadOnlyMemory<byte> plain);
+    EncryptedValue Encrypt(ReadOnlySpan<byte> plain);
     byte[] Decrypt(EncryptedValue input);
 }

IdentityShroud.Core/Contracts/IDekEncryptionService.cs

@@ -6,6 +6,6 @@ namespace IdentityShroud.Core.Contracts;
 
 public interface IDekEncryptionService
 {
-    EncryptedDek Encrypt(ReadOnlyMemory<byte> plain);
+    EncryptedDek Encrypt(ReadOnlySpan<byte> plain);
     byte[] Decrypt(EncryptedDek input);
 }

IdentityShroud.Core/Security/Encryption.cs

@@ -12,7 +12,7 @@ public static class Encryption
         new(1, 12, 16), // version 1
     ];
     
-    public static byte[] Encrypt(ReadOnlyMemory<byte> plaintext, ReadOnlySpan<byte> key)
+    public static byte[] Encrypt(ReadOnlySpan<byte> plaintext, ReadOnlySpan<byte> key)
     {
         const int versionNumber = 1; 
         AlgVersion versionParams = _versions[versionNumber];
@@ -31,7 +31,7 @@ public static class Encryption
         // use the spans to place the data directly in its place
         RandomNumberGenerator.Fill(nonce);
         using var aes = new AesGcm(key, versionParams.TagSize);
-        aes.Encrypt(nonce, plaintext.Span, cipher, tag);
+        aes.Encrypt(nonce, plaintext, cipher, tag);
         return result;
     }
     

IdentityShroud.Core/Services/DataEncryptionService.cs

@@ -31,7 +31,7 @@ public class DataEncryptionService(
         return Encryption.Decrypt(input.Value, key);
     }
 
-    public EncryptedValue Encrypt(ReadOnlyMemory<byte> plain)
+    public EncryptedValue Encrypt(ReadOnlySpan<byte> plain)
     {
         var dek = GetActiveDek();
         var key = dekCryptor.Decrypt(dek.KeyData);

IdentityShroud.Core/Services/DekEncryptionService.cs

@@ -22,7 +22,7 @@ public class DekEncryptionService : IDekEncryptionService
         //     throw new Exception("Key must be 256 bits (32 bytes) for AES‑256‑GCM.");
     }
 
-    public EncryptedDek Encrypt(ReadOnlyMemory<byte> plaintext)
+    public EncryptedDek Encrypt(ReadOnlySpan<byte> plaintext)
     {
         var encryptionKey = ActiveKey;
         byte[] cipher = Encryption.Encrypt(plaintext, encryptionKey.Key);

IdentityShroud.TestUtils/Substitutes/EncryptionServiceSubstitute.cs

@@ -1,21 +0,0 @@
-using IdentityShroud.Core.Contracts;
-using IdentityShroud.Core.Security;
-
-namespace IdentityShroud.TestUtils.Substitutes;
-
-public static class EncryptionServiceSubstitute
-{
-    public static KekId KeyId { get; } = KekId.NewId(); 
-    
-    public static IDekEncryptionService CreatePassthrough()
-    {
-        var encryptionService = Substitute.For<IDekEncryptionService>();
-        encryptionService
-            .Encrypt(Arg.Any<ReadOnlyMemory<byte>>())
-            .Returns(x => new EncryptedDek(KeyId, x.ArgAt<ReadOnlyMemory<byte>>(0).ToArray()));
-        encryptionService
-            .Decrypt(Arg.Any<EncryptedDek>())
-            .Returns(x => x.ArgAt<EncryptedDek>(0).Value);
-        return encryptionService;
-    }
-}

IdentityShroud.TestUtils/Substitutes/NullDataEncryptionService.cs

@@ -0,0 +1,18 @@
+using IdentityShroud.Core.Contracts;
+using IdentityShroud.Core.Security;
+
+namespace IdentityShroud.TestUtils.Substitutes;
+
+public class NullDataEncryptionService : IDataEncryptionService
+{
+    public DekId KeyId { get; } = DekId.NewId(); 
+    public EncryptedValue Encrypt(ReadOnlySpan<byte> plain)
+    {
+        return new(KeyId, plain.ToArray());
+    }
+
+    public byte[] Decrypt(EncryptedValue input)
+    {
+        return input.Value;
+    }
+}

IdentityShroud.TestUtils/Substitutes/NullDekEncryptionService.cs

@@ -0,0 +1,18 @@
+using IdentityShroud.Core.Contracts;
+using IdentityShroud.Core.Security;
+
+namespace IdentityShroud.TestUtils.Substitutes;
+
+public class NullDekEncryptionService : IDekEncryptionService
+{
+    public KekId KeyId { get; } = KekId.NewId(); 
+    public EncryptedDek Encrypt(ReadOnlySpan<byte> plain)
+    {
+        return new(KeyId, plain.ToArray());
+    }
+
+    public byte[] Decrypt(EncryptedDek input)
+    {
+        return input.Value;
+    }
+}