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

Add support for an alternate digest key

Browse source
This commit is contained in:
jvyden 2022-02-16 13:59:29 -05:00
commit fac06e2b1f
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ProjectLighthouse/Startup/Startup.cs
View file

@ -97,6 +97,7 @@ public class Startup
{ {
bool computeDigests = true; bool computeDigests = true;
string serverDigestKey = ServerSettings.Instance.ServerDigestKey; string serverDigestKey = ServerSettings.Instance.ServerDigestKey;
string alternateDigestKey = ServerSettings.Instance.AlternateDigestKey;
if (string.IsNullOrEmpty(serverDigestKey)) if (string.IsNullOrEmpty(serverDigestKey))
{ {
Logger.Log Logger.Log
@ -175,12 +176,20 @@ public class Startup
// 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))
{
if (clientRequestDigest != sentDigest) if (clientRequestDigest != sentDigest)
{ {
context.Response.StatusCode = 403; // If we got here, the normal ServerDigestKey failed to validate. Lets try again with the alternate digest key.
context.Abort(); clientRequestDigest = await HashHelper.ComputeDigest(digestPath, authCookie, body, alternateDigestKey);
return; if (clientRequestDigest != sentDigest)
{
// We still failed to validate. Abort the request.
context.Response.StatusCode = 403;
context.Abort();
return;
}
} }
}
context.Response.Headers.Add("X-Digest-B", clientRequestDigest); context.Response.Headers.Add("X-Digest-B", clientRequestDigest);
context.Request.Body.Position = 0; context.Request.Body.Position = 0;

3
ProjectLighthouse/Types/Settings/ServerSettings.cs
View file

@ -12,7 +12,7 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings;
[Serializable] [Serializable]
public class ServerSettings public class ServerSettings
{ {
public const int CurrentConfigVersion = 21; // MUST BE INCREMENTED FOR EVERY CONFIG CHANGE! public const int CurrentConfigVersion = 22; // MUST BE INCREMENTED FOR EVERY CONFIG CHANGE!
private static FileSystemWatcher fileWatcher; private static FileSystemWatcher fileWatcher;
static ServerSettings() static ServerSettings()
{ {
@ -114,6 +114,7 @@ public class ServerSettings
public string ExternalUrl { get; set; } = "http://localhost:10060"; public string ExternalUrl { get; set; } = "http://localhost:10060";
public string ServerDigestKey { get; set; } public string ServerDigestKey { get; set; }
public string AlternateDigestKey { get; set; }
public bool UseExternalAuth { get; set; } public bool UseExternalAuth { get; set; }
public bool CheckForUnsafeFiles { get; set; } = true; public bool CheckForUnsafeFiles { get; set; } = true;