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

[Dynamic Instrumentation] Check for valid gzip content #6687

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Dynamic Instrumentation] Check for valid gzip content #6687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 39 additions & 9 deletions tracer/src/Datadog.Trace/Debugger/Upload/SymbolUploadApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,13 @@ public override async Task<bool> SendBatchAsync(ArraySegment<byte> symbols)
}
else
{
using var memoryStream = new MemoryStream();
#if NETFRAMEWORK
using (var gzipStream = new Vendors.ICSharpCode.SharpZipLib.GZip.GZipOutputStream(memoryStream))
#else
using (var gzipStream = new GZipStream(memoryStream, CompressionMode.Compress))
#endif
var compressedSymbols = await CompressDataAsync(symbols);
if (compressedSymbols == null)
{
await gzipStream.WriteAsync(symbols.Array, 0, symbols.Array.Length).ConfigureAwait(false);
await gzipStream.FlushAsync().ConfigureAwait(false);
return false;
}

symbolsItem = new MultipartFormItem("file", MimeTypes.Gzip, "file.gz", new ArraySegment<byte>(memoryStream.ToArray()));
symbolsItem = new MultipartFormItem("file", MimeTypes.Gzip, "file.gz", compressedSymbols.Value);
}

var items = new[] { symbolsItem, new MultipartFormItem("event", MimeTypes.Json, "event.json", _eventMetadata) };
Expand Down Expand Up @@ -130,5 +125,40 @@ public override async Task<bool> SendBatchAsync(ArraySegment<byte> symbols)

return false;
}

public static async Task<ArraySegment<byte>?> CompressDataAsync(ArraySegment<byte> data)
{
using var memoryStream = new MemoryStream();

#if NETFRAMEWORK
using (var gzipStream = new Vendors.ICSharpCode.SharpZipLib.GZip.GZipOutputStream(memoryStream))
#else
using (var gzipStream = new GZipStream(memoryStream, CompressionMode.Compress))
#endif
{
await gzipStream.WriteAsync(data.Array!, data.Offset, data.Count).ConfigureAwait(false);
await gzipStream.FlushAsync().ConfigureAwait(false);
}

var compressedData = memoryStream.ToArray();

// see here about the following validation: https://forensics.wiki/gzip/
if (compressedData.Length < 18) // minimum size for header + footer
{
Log.Error("Compression produced invalid data: size {Size} bytes is below minimum valid GZip size", property: compressedData.Length);
return null;
}

if (compressedData[0] != 0x1F || compressedData[1] != 0x8B) // header magic numbers
{
Log.Error(
"Compression produced invalid data: invalid GZip header {Header}",
BitConverter.ToString(System.Linq.Enumerable.ToArray(System.Linq.Enumerable.Take(compressedData, 2))));

return null;
}

return new ArraySegment<byte>(compressedData);
}
}
}
Loading