Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-28 07:58:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix digest calculation when using deflate compression

Browse source
This commit is contained in:
Slendy 2023-04-06 22:29:31 -05:00
commit 7eeda59eab
No known key found for this signature in database
GPG key ID: 7288D68361B91428
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ProjectLighthouse.Servers.GameServer/Middlewares/DigestMiddleware.cs
View file

@ -1,9 +1,9 @@
using System.IO.Compression;
using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.Middlewares; using LBPUnion.ProjectLighthouse.Middlewares;
using Microsoft.Extensions.Primitives; using Microsoft.Extensions.Primitives;
using Org.BouncyCastle.Utilities.Zlib;
namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Middlewares; namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Middlewares;
@ -104,28 +104,15 @@ public class DigestMiddleware : Middleware
await this.next(context); // Handle the request so we can get the server digest hash await this.next(context); // Handle the request so we can get the server digest hash
responseBuffer.Position = 0; responseBuffer.Position = 0;
// Compute the server digest hash.
if (this.computeDigests)
{
responseBuffer.Position = 0;
string digestKey = usedAlternateDigestKey
? ServerConfiguration.Instance.DigestKey.AlternateDigestKey
: ServerConfiguration.Instance.DigestKey.PrimaryDigestKey;
// Compute the digest for the response.
string serverDigest = CryptoHelper.ComputeDigest(context.Request.Path, authCookie, responseBuffer.ToArray(), digestKey);
context.Response.Headers.Add("X-Digest-A", serverDigest);
}
if (responseBuffer.Length > 1000 && context.Request.Headers.AcceptEncoding.Contains("deflate") && (context.Response.ContentType ?? string.Empty).Contains("text/xml")) if (responseBuffer.Length > 1000 && context.Request.Headers.AcceptEncoding.Contains("deflate") && (context.Response.ContentType ?? string.Empty).Contains("text/xml"))
{ {
context.Response.Headers.Add("X-Original-Content-Length", responseBuffer.Length.ToString()); context.Response.Headers.Add("X-Original-Content-Length", responseBuffer.Length.ToString());
context.Response.Headers.Add("Vary", "Accept-Encoding"); context.Response.Headers.Add("Vary", "Accept-Encoding");
MemoryStream resultStream = new(); MemoryStream resultStream = new();
await using ZLibStream stream = new(resultStream, CompressionMode.Compress, true); const int defaultCompressionLevel = 6;
await using ZOutputStreamLeaveOpen stream = new(resultStream, defaultCompressionLevel);
await stream.WriteAsync(responseBuffer.ToArray()); await stream.WriteAsync(responseBuffer.ToArray());
stream.Close(); stream.Finish();
resultStream.Position = 0; resultStream.Position = 0;
context.Response.Headers.Add("Content-Length", resultStream.Length.ToString()); context.Response.Headers.Add("Content-Length", resultStream.Length.ToString());
@ -141,6 +128,20 @@ public class DigestMiddleware : Middleware
context.Response.Headers.Add(headerName, responseBuffer.Length.ToString()); context.Response.Headers.Add(headerName, responseBuffer.Length.ToString());
} }
// Compute the server digest hash.
if (this.computeDigests)
{
responseBuffer.Position = 0;
string digestKey = usedAlternateDigestKey
? ServerConfiguration.Instance.DigestKey.AlternateDigestKey
: ServerConfiguration.Instance.DigestKey.PrimaryDigestKey;
// Compute the digest for the response.
string serverDigest = CryptoHelper.ComputeDigest(context.Request.Path, authCookie, responseBuffer.ToArray(), digestKey);
context.Response.Headers.Add("X-Digest-A", serverDigest);
}
// Copy the buffered response to the actual response stream. // Copy the buffered response to the actual response stream.
responseBuffer.Position = 0; responseBuffer.Position = 0;
await responseBuffer.CopyToAsync(oldResponseStream); await responseBuffer.CopyToAsync(oldResponseStream);