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

Compute proper digest response if we used the alternate digest key

Browse source
This commit is contained in:
jvyden 2022-02-16 14:18:57 -05:00
commit b4509c9906
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ProjectLighthouse/Startup/Startup.cs
View file

@ -96,9 +96,8 @@ public class Startup
public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment env) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{ {
bool computeDigests = true; bool computeDigests = true;
string serverDigestKey = ServerSettings.Instance.ServerDigestKey;
string alternateDigestKey = ServerSettings.Instance.AlternateDigestKey; if (string.IsNullOrEmpty(ServerSettings.Instance.ServerDigestKey))
if (string.IsNullOrEmpty(serverDigestKey))
{ {
Logger.Log Logger.Log
( (
@ -170,9 +169,11 @@ public class Startup
string digestPath = context.Request.Path; string digestPath = context.Request.Path;
Stream body = context.Request.Body; Stream body = context.Request.Body;
bool usedAlternateDigestKey = false;
if (computeDigests && digestPath.StartsWith("/LITTLEBIGPLANETPS3_XML")) if (computeDigests && digestPath.StartsWith("/LITTLEBIGPLANETPS3_XML"))
{ {
string clientRequestDigest = await HashHelper.ComputeDigest(digestPath, authCookie, body, serverDigestKey); string clientRequestDigest = await HashHelper.ComputeDigest(digestPath, authCookie, body, ServerSettings.Instance.ServerDigestKey);
// Check the digest we've just calculated against the X-Digest-A header if the game set the header. They should match. // Check the digest we've just calculated against the X-Digest-A header if the game set the header. They should match.
if (context.Request.Headers.TryGetValue("X-Digest-A", out StringValues sentDigest)) if (context.Request.Headers.TryGetValue("X-Digest-A", out StringValues sentDigest))
@ -180,7 +181,9 @@ public class Startup
if (clientRequestDigest != sentDigest) if (clientRequestDigest != sentDigest)
{ {
// If we got here, the normal ServerDigestKey failed to validate. Lets try again with the alternate digest key. // If we got here, the normal ServerDigestKey failed to validate. Lets try again with the alternate digest key.
clientRequestDigest = await HashHelper.ComputeDigest(digestPath, authCookie, body, alternateDigestKey); usedAlternateDigestKey = true;
clientRequestDigest = await HashHelper.ComputeDigest(digestPath, authCookie, body, ServerSettings.Instance.AlternateDigestKey);
if (clientRequestDigest != sentDigest) if (clientRequestDigest != sentDigest)
{ {
// We still failed to validate. Abort the request. // We still failed to validate. Abort the request.
@ -207,8 +210,10 @@ public class Startup
{ {
responseBuffer.Position = 0; responseBuffer.Position = 0;
string digestKey = usedAlternateDigestKey ? ServerSettings.Instance.AlternateDigestKey : ServerSettings.Instance.ServerDigestKey;
// Compute the digest for the response. // Compute the digest for the response.
string serverDigest = await HashHelper.ComputeDigest(context.Request.Path, authCookie, responseBuffer, serverDigestKey); string serverDigest = await HashHelper.ComputeDigest(context.Request.Path, authCookie, responseBuffer, digestKey);
context.Response.Headers.Add("X-Digest-A", serverDigest); context.Response.Headers.Add("X-Digest-A", serverDigest);
} }