Use RecyclableMemoryStream

Directory.Packages.props

@@ -49,6 +49,7 @@
       See https://github.com/OrchardCMS/OrchardCore/pull/16057 for more information.
     -->
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.0" />
+    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="MimeKit" Version="4.8.0" />
     <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />

src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaStep.cs

@@ -48,7 +48,8 @@ protected override async Task HandleAsync(RecipeExecutionContext context)
 
             if (!string.IsNullOrWhiteSpace(file.Base64))
             {
-                stream = new MemoryStream(Convert.FromBase64String(file.Base64));
+                stream = MemoryStreamFactory.GetStream();
+                stream.Write(Str.FromBase64String(file.Base64));
             }
             else if (!string.IsNullOrWhiteSpace(file.SourcePath))
             {

src/OrchardCore.Modules/OrchardCore.Queries/Sql/Controllers/AdminController.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Text;
 using System.Text.Json;
 using Dapper;
 using Fluid;
@@ -43,7 +44,10 @@ public AdminController(
     [Admin("Queries/Sql/Query", "QueriesRunSql")]
     public Task<IActionResult> Query(string query)
     {
-        query = string.IsNullOrWhiteSpace(query) ? "" : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query));
+        query = string.IsNullOrWhiteSpace(query)
+            ? ""
+            : Encoding.UTF8.GetString(Str.FromBase64String(query));
+
         return Query(new AdminQueryViewModel
         {
             DecodedQuery = query,

src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/AdminController.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.Globalization;
+using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -466,7 +467,9 @@ public async Task<IActionResult> Query(string indexName, string query)
         return await Query(new AdminQueryViewModel
         {
             IndexName = indexName,
-            DecodedQuery = string.IsNullOrWhiteSpace(query) ? string.Empty : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query))
+            DecodedQuery = string.IsNullOrWhiteSpace(query)
+            ? string.Empty
+            : Encoding.UTF8.GetString(Str.FromBase64String(query))
         });
     }
 

src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/AdminController.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.Globalization;
+using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -355,7 +356,10 @@ public async Task<ActionResult> Delete(LuceneIndexSettingsViewModel model)
 
     public Task<IActionResult> Query(string indexName, string query)
     {
-        query = string.IsNullOrWhiteSpace(query) ? "" : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query));
+        query = string.IsNullOrWhiteSpace(query)
+            ? ""
+            : Encoding.UTF8.GetString(Str.FromBase64String(query));
+
         return Query(new AdminQueryViewModel { IndexName = indexName, DecodedQuery = query });
     }
 

src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapController.cs

@@ -86,7 +86,7 @@ public async Task<IActionResult> Index(string sitemapId, CancellationToken cance
 
                     document.Declaration = new XDeclaration("1.0", "utf-8", null);
 
-                    var stream = new MemoryStream();
+                    using var stream = MemoryStreamFactory.GetStream();
                     await document.SaveAsync(stream, SaveOptions.None, cancellationToken);
 
                     if (stream.Length >= ErrorLength)

src/OrchardCore.Modules/OrchardCore.Users/Controllers/ResetPasswordController.cs

@@ -160,7 +160,7 @@ public async Task<IActionResult> ResetPasswordPOST()
 
         if (ModelState.IsValid)
         {
-            var token = Encoding.UTF8.GetString(Convert.FromBase64String(model.ResetToken));
+            var token = Encoding.UTF8.GetString(Str.FromBase64String(model.ResetToken));
 
             if (await _userService.ResetPasswordAsync(model.UsernameOrEmail, token, model.NewPassword, ModelState.AddModelError))
             {

src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/HomeController.cs

@@ -47,14 +47,15 @@ public async Task<IActionResult> ServiceEndpoint([ModelBinder(BinderType = typeo
         };
 
         // Save to an intermediate MemoryStream to preserve the encoding declaration.
-        using var stream = new MemoryStream();
+        using var stream = MemoryStreamFactory.GetStream();
         using (var w = XmlWriter.Create(stream, settings))
         {
             var result = _writer.MapMethodResponse(methodResponse);
             result.Save(w);
         }
 
-        var content = Encoding.UTF8.GetString(stream.ToArray());
+        var content = Encoding.UTF8.GetString(stream.GetBuffer(), 0, (int)stream.Length);
+
         return Content(content, "text/xml");
     }
 

src/OrchardCore/OrchardCore.Abstractions/MemoryStreamFactory.cs

@@ -0,0 +1,14 @@
+using Microsoft.IO;
+
+namespace OrchardCore;
+
+public static class MemoryStreamFactory
+{
+    private static readonly RecyclableMemoryStreamManager _manager = new();
+
+    public static RecyclableMemoryStream GetStream(string tag = null)
+        => _manager.GetStream(tag);
+
+    public static RecyclableMemoryStream GetStream(int requiredSize, string tag = null)
+        => _manager.GetStream(tag, requiredSize);
+}

src/OrchardCore/OrchardCore.Abstractions/OrchardCore.Abstractions.csproj

@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="JsonPath.Net" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
     <PackageReference Include="ZString" />
   </ItemGroup>
 

src/OrchardCore/OrchardCore.Abstractions/Str.cs

@@ -0,0 +1,34 @@
+namespace OrchardCore;
+
+public static class Str
+{
+    public static ReadOnlySpan<byte> FromBase64String(string base64)
+    {
+        if (string.IsNullOrEmpty(base64))
+        {
+            return [];
+        }
+
+        var neededLength = GetByteArrayLengthFromBase64(base64);
+
+        using var memoryStream = MemoryStreamFactory.GetStream(neededLength);
+        var bytes = memoryStream.GetSpan(neededLength);
+
+        if (!Convert.TryFromBase64String(base64, bytes, out var _))
+        {
+            throw new FormatException("Invalid Base64 string.");
+        }
+
+        return bytes;
+    }
+
+    // The length of a Base64-encoded string corresponds to the original byte length. 
+    // Base64 encoding converts every 3 bytes of data into 4 characters. 
+    // To calculate the original byte length from the Base64 string, use the formula: 
+    // (length * 3) / 4. This ensures the correct byte count by multiplying the length by 3 
+    // before dividing by 4.
+    private static int GetByteArrayLengthFromBase64(string base64String)
+    {
+        return base64String.Length * 3 / 4;
+    }
+}

src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFileStore.cs

@@ -39,14 +39,17 @@ public class BlobFileStore : IFileStore
     private readonly IClock _clock;
     private readonly BlobContainerClient _blobContainer;
     private readonly IContentTypeProvider _contentTypeProvider;
+
     private readonly string _basePrefix;
 
-    public BlobFileStore(BlobStorageOptions options, IClock clock, IContentTypeProvider contentTypeProvider)
+    public BlobFileStore(
+        BlobStorageOptions options,
+        IClock clock,
+        IContentTypeProvider contentTypeProvider)
     {
         _options = options;
         _clock = clock;
         _contentTypeProvider = contentTypeProvider;
-
         _blobContainer = new BlobContainerClient(_options.ConnectionString, _options.ContainerName);
 
         if (!string.IsNullOrEmpty(_options.BasePath))
@@ -436,6 +439,7 @@ private async Task CreateDirectoryAsync(string path)
 
         // Create a directory marker file to make this directory appear when listing directories.
         using var stream = new MemoryStream(MarkerFileContent);
+
         await placeholderBlob.UploadAsync(stream);
     }
 

src/OrchardCore/OrchardCore.Infrastructure/Documents/DefaultDocumentSerializer.cs

@@ -24,7 +24,10 @@ public Task<byte[]> SerializeAsync<TDocument>(TDocument document, int compressTh
         var data = JsonSerializer.SerializeToUtf8Bytes(document, _serializerOptions);
         if (data.Length >= compressThreshold)
         {
-            data = Compress(data);
+            var stream = MemoryStreamFactory.GetStream();
+            var length = Compress(data, stream);
+
+            data = stream.GetBuffer().AsSpan().Slice(0, length).ToArray();
         }
 
         return Task.FromResult(data);
@@ -33,14 +36,16 @@ public Task<byte[]> SerializeAsync<TDocument>(TDocument document, int compressTh
     public Task<TDocument> DeserializeAsync<TDocument>(byte[] data)
         where TDocument : class, IDocument, new()
     {
+        TDocument document;
+
         if (IsCompressed(data))
         {
-            data = Decompress(data);
+            document = JsonSerializer.Deserialize<TDocument>(Decompress(data), _serializerOptions);
+        }
+        else
+        {
+            document = JsonSerializer.Deserialize<TDocument>(data, _serializerOptions);
         }
-
-        using var ms = new MemoryStream(data);
-
-        var document = JsonSerializer.Deserialize<TDocument>(ms, _serializerOptions);
 
         return Task.FromResult(document);
     }
@@ -57,37 +62,23 @@ internal static bool IsCompressed(byte[] data)
         return false;
     }
 
-    internal static byte[] Compress(byte[] data)
+    internal static int Compress(byte[] data, Stream output)
     {
         using var input = new MemoryStream(data);
-        using var output = new MemoryStream();
-        using (var gzip = new GZipStream(output, CompressionMode.Compress))
-        {
-            input.CopyTo(gzip);
-        }
+        using var gZip = new GZipStream(output, CompressionMode.Compress);
 
-        if (output.TryGetBuffer(out var buffer))
-        {
-            return buffer.Array;
-        }
+        input.CopyTo(gZip);
 
-        return output.ToArray();
+        return (int)gZip.Length;
     }
 
-    internal static byte[] Decompress(byte[] data)
+    internal static ReadOnlySpan<byte> Decompress(byte[] data)
     {
         using var input = new MemoryStream(data);
-        using var output = new MemoryStream();
-        using (var gzip = new GZipStream(input, CompressionMode.Decompress))
-        {
-            gzip.CopyTo(output);
-        }
-
-        if (output.TryGetBuffer(out var buffer))
-        {
-            return buffer.Array;
-        }
+        using var output = MemoryStreamFactory.GetStream();
+        using var gZip = new GZipStream(input, CompressionMode.Decompress);
+        gZip.CopyTo(output);
 
-        return output.ToArray();
+        return output.GetBuffer().AsSpan().Slice(0, (int)gZip.Length);
     }
 }

src/OrchardCore/OrchardCore.Infrastructure/Scripting/CommonGeneratorMethods.cs

@@ -11,7 +11,7 @@ public class CommonGeneratorMethods : IGlobalMethodProvider
         Name = "base64",
         Method = serviceProvider => (Func<string, string>)(encoded =>
         {
-            return Encoding.UTF8.GetString(Convert.FromBase64String(encoded));
+            return Encoding.UTF8.GetString(Str.FromBase64String(encoded));
         }),
     };
 
@@ -28,26 +28,30 @@ public class CommonGeneratorMethods : IGlobalMethodProvider
     /// Converts a Base64 encoded gzip stream to an uncompressed Base64 string.
     /// See http://www.txtwizard.net/compression.
     /// </summary>
-    private static readonly GlobalMethod _gZip = new()
+    private readonly GlobalMethod _gZip = new()
     {
         Name = "gzip",
         Method = serviceProvider => (Func<string, string>)(encoded =>
         {
-            var bytes = Convert.FromBase64String(encoded);
-            using var gzip = new GZipStream(new MemoryStream(bytes), CompressionMode.Decompress);
+            using var stream = MemoryStreamFactory.GetStream();
+            stream.Write(Str.FromBase64String(encoded));
+            stream.Seek(0, SeekOrigin.Begin);
 
-            var decompressed = new MemoryStream();
+            using var gZip = new GZipStream(stream, CompressionMode.Decompress, leaveOpen: true);
+
+            using var decompressed = MemoryStreamFactory.GetStream();
             var buffer = new byte[1024];
             int nRead;
 
-            while ((nRead = gzip.Read(buffer, 0, buffer.Length)) > 0)
+            while ((nRead = gZip.Read(buffer, 0, buffer.Length)) > 0)
             {
                 decompressed.Write(buffer, 0, nRead);
             }
 
-            return Convert.ToBase64String(decompressed.ToArray());
+            return Convert.ToBase64String(decompressed.GetBuffer(), 0, (int)decompressed.Length);
         }),
     };
 
-    public IEnumerable<GlobalMethod> GetMethods() => new[] { _base64, _html, _gZip };
+    public IEnumerable<GlobalMethod> GetMethods()
+        => new[] { _base64, _html, _gZip };
 }

src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptEngine.cs

@@ -46,9 +46,11 @@ public object Evaluate(IScriptingScope scope, string script)
             }
 
             using var fileStream = fileInfo.CreateReadStream();
-            using var ms = new MemoryStream();
-            fileStream.CopyTo(ms);
-            return Convert.ToBase64String(ms.ToArray());
+            using var memoryStream = MemoryStreamFactory.GetStream();
+            memoryStream.WriteTo(fileStream);
+            memoryStream.Seek(0, SeekOrigin.Begin);
+
+            return Convert.ToBase64String(memoryStream.GetBuffer().AsSpan().Slice(0, (int)memoryStream.Length));
         }
         else
         {

src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellConfigurationSources.cs

@@ -74,7 +74,9 @@ public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
         if (configuration is not null)
         {
             var configurationString = configuration.ToJsonString(JOptions.Default);
-            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configurationString)));
+            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(configurationString));
+
+            builder.AddTenantJsonStream(stream);
         }
     }
 

src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsSettingsSources.cs

@@ -42,7 +42,9 @@ public async Task AddSourcesAsync(IConfigurationBuilder builder)
         if (document.ShellsSettings is not null)
         {
             var shellsSettingsString = document.ShellsSettings.ToJsonString(JOptions.Default);
-            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(shellsSettingsString)));
+            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(shellsSettingsString));
+
+            builder.AddTenantJsonStream(stream);
         }
     }
 
@@ -53,7 +55,9 @@ public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
         {
             var shellSettings = new JsonObject { [tenant] = document.ShellsSettings[tenant] };
             var shellSettingsString = shellSettings.ToJsonString(JOptions.Default);
-            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(shellSettingsString)));
+            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(shellSettingsString));
+
+            builder.AddTenantJsonStream(stream);
         }
     }
 

src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellConfigurationSources.cs

@@ -91,12 +91,12 @@ public async Task SaveAsync(string tenant, IDictionary<string, string> data)
 
     public async Task RemoveAsync(string tenant)
     {
-        var appsettings = IFileStoreExtensions.Combine(null, _container, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
+        var appSettings = IFileStoreExtensions.Combine(null, _container, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
 
-        var fileInfo = await _shellsFileStore.GetFileInfoAsync(appsettings);
+        var fileInfo = await _shellsFileStore.GetFileInfoAsync(appSettings);
         if (fileInfo != null)
         {
-            await _shellsFileStore.RemoveFileAsync(appsettings);
+            await _shellsFileStore.RemoveFileAsync(appSettings);
         }
     }