Fixed memory stream issues with Security serialization

Author: eocron

Directory.Build.props

@@ -8,7 +8,7 @@
         <RepositoryType>git</RepositoryType>
         <PackageTags>eocron</PackageTags>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-        <Version>3.0.0</Version>
+        <Version>3.0.1</Version>
         <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <LangVersion>latest</LangVersion>

Eocron.Serialization.Security/SymmetricEncryptionSerializationConverter.cs

@@ -65,11 +65,12 @@ protected override void SerializeTo(Type type, object obj, BinaryWriter writer)
         using var ms = new MemoryStream();
         _inner.SerializeTo(type, obj, ms);
         using var nonce = PasswordDerivationHelper.CreateRandomBytes(_pool, NonceByteSize);
-        using var encrypted = _pool.RentExact((int)ms.Position + MacByteSize);
+        var cipher = CreateAeadCipher(nonce, true);
+        using var encrypted = _pool.RentExact(cipher.GetOutputSize((int)ms.Position));
         using var body = new RentedAesGcmData(nonce, encrypted);
-        var cipher = CreateAeadCipher(body.Nonce, true);
+        
         var len = cipher.ProcessBytes(
-            ms.GetBuffer(),
+            new Span<byte>(ms.GetBuffer(), 0, (int)ms.Position),
             body.EncryptedPayload.Data);
         cipher.DoFinal(body.EncryptedPayload.Data.Slice(len));
 

Eocron.Serialization.Tests/EncryptionSerializationTestsBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using Eocron.Serialization.Tests.Models.Json;
+using Eocron.Serialization.Tests.Models.Protobuf;
 using FluentAssertions;
 using NUnit.Framework;
 
@@ -14,9 +15,9 @@ public abstract class EncryptionSerializationTestsBase
         public void EncryptThenDecrypt()
         {
             var converter = GetConverter();
-            var model = new JsonTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string"};
+            var model = new ProtobufTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string"};
             var data = converter.SerializeToBytes(model);
-            var decryptedModel = converter.Deserialize<JsonTestModel>(data);
+            var decryptedModel = converter.Deserialize<ProtobufTestModel>(data);
             decryptedModel.FooBarString.Should().Be("some_string");
             decryptedModel.Should().BeEquivalentTo(model);
         }
@@ -26,9 +27,9 @@ public void EncryptThenDecryptWithAnotherConverterInstance()
         {
             var converter1 = GetConverter();
             var converter2 = GetConverter();
-            var model = new JsonTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string"};
+            var model = new ProtobufTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string"};
             var data = converter1.SerializeToBytes(model);
-            var decryptedModel = converter2.Deserialize<JsonTestModel>(data);
+            var decryptedModel = converter2.Deserialize<ProtobufTestModel>(data);
             decryptedModel.FooBarString.Should().Be("some_string");
             decryptedModel.Should().BeEquivalentTo(model);
         }
@@ -37,17 +38,17 @@ public void EncryptThenDecryptWithAnotherConverterInstance()
         public void EncryptMultipleThenDecrypt()
         {
             var converter = GetConverter();
-            var model1 = new JsonTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string"};
-            var model2 = new JsonTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string_2"};
+            var model1 = new ProtobufTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string"};
+            var model2 = new ProtobufTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string_2"};
             var ms = new MemoryStream();
             converter.SerializeTo(model1, ms);
             converter.SerializeTo(model2, ms);
             ms.Seek(0, SeekOrigin.Begin);
 
-            var decryptedModel1 = converter.DeserializeFrom<JsonTestModel>(ms);
+            var decryptedModel1 = converter.DeserializeFrom<ProtobufTestModel>(ms);
             decryptedModel1.FooBarString.Should().Be("some_string");
             decryptedModel1.Should().BeEquivalentTo(model1);
-            var decryptedModel2 = converter.DeserializeFrom<JsonTestModel>(ms);
+            var decryptedModel2 = converter.DeserializeFrom<ProtobufTestModel>(ms);
             decryptedModel2.FooBarString.Should().Be("some_string_2");
             decryptedModel2.Should().BeEquivalentTo(model2);
         }
@@ -56,7 +57,7 @@ public void EncryptMultipleThenDecrypt()
         public void EncryptionDoesNotRepeat()
         {
             var converter = GetConverter();
-            var model = new JsonTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string"};
+            var model = new ProtobufTestModel() { Guid = Guid.NewGuid(), FooBarString = "some_string"};
             var data1 = converter.SerializeToBytes(model);
             var data2 = converter.SerializeToBytes(model);
             data1.Should().NotBeEquivalentTo(data2);

Eocron.Serialization.Tests/SymmetricEncryptionSerializationTests.cs

@@ -1,4 +1,5 @@
 using Eocron.Serialization.Json;
+using Eocron.Serialization.Protobuf;
 using Eocron.Serialization.Security;
 using NUnit.Framework;
 
@@ -9,7 +10,7 @@ public class SymmetricEncryptionSerializationTests : EncryptionSerializationTest
     {
         public override ISerializationConverter GetConverter()
         {
-            return  new SymmetricEncryptionSerializationConverter(SerializationConverterJson.Json, "foobar");
+            return  new SymmetricEncryptionSerializationConverter(SerializationConverterProtobuf.Protobuf, "foobar");
         }
     }
 }