Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deserialize compressed documents correctly #16415

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Deserialize compressed documents correctly #16415

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f5a751
Deserialize compressed documents correctly
MikeAlhayek Jul 9, 2024
fd18396
use DocumentJsonSerializerOptions
MikeAlhayek Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions src/OrchardCore/OrchardCore.Infrastructure/Documents/DefaultDocumentSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.IO.Compression;
using System.Text;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using OrchardCore.Data.Documents;
Expand All @@ -14,13 +15,10 @@ public class DefaultDocumentSerializer : IDocumentSerializer
{
public static readonly DefaultDocumentSerializer Instance = new();

public DefaultDocumentSerializer()
public Task<byte[]> SerializeAsync<TDocument>(TDocument document, int compressThreshold = int.MaxValue)
where TDocument : class, IDocument, new()
{
}

public Task<byte[]> SerializeAsync<TDocument>(TDocument document, int compressThreshold = int.MaxValue) where TDocument : class, IDocument, new()
{
var data = Encoding.UTF8.GetBytes(JConvert.SerializeObject(document));
var data = JsonSerializer.SerializeToUtf8Bytes(document, JOptions.Default);
if (data.Length >= compressThreshold)
{
data = Compress(data);
Expand All @@ -29,22 +27,34 @@ public DefaultDocumentSerializer()
return Task.FromResult(data);
}

public Task<TDocument> DeserializeAsync<TDocument>(byte[] data) where TDocument : class, IDocument, new()
public Task<TDocument> DeserializeAsync<TDocument>(byte[] data)
where TDocument : class, IDocument, new()
{
if (IsCompressed(data))
{
data = Decompress(data);
}

var document = JConvert.DeserializeObject<TDocument>(Encoding.UTF8.GetString(data));
using var ms = new MemoryStream(data);

var document = JsonSerializer.Deserialize<TDocument>(ms, JOptions.Default);

return Task.FromResult(document);
}

private static readonly byte[] _gZipHeaderBytes = [0x1f, 0x8b];

internal static bool IsCompressed(byte[] data) =>
data.Length < _gZipHeaderBytes.Length && data[0..1] == _gZipHeaderBytes;
internal static bool IsCompressed(byte[] data)
{
// Ensure data is at least as long as the GZip header
if (data.Length >= _gZipHeaderBytes.Length)
{
// Compare the header bytes.
return data.Take(_gZipHeaderBytes.Length).SequenceEqual(_gZipHeaderBytes);
}

return false;
}

internal static byte[] Compress(byte[] data)
{
Expand Down