Skip to content

Super headers as query #156

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

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

Super headers as query #156

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions src/Helldivers-2-API/Metrics/ClientMetric.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,13 @@ public static string GetClientName(HttpContext context)

return result;
}

private static string? GetSuperClient(HttpContext context)
{
if (context.Request.Headers.TryGetValue(Constants.CLIENT_HEADER_NAME, out var superClient))
if (string.IsNullOrWhiteSpace(superClient) is false)
return superClient;

return context.Request.Query[Constants.CLIENT_HEADER_NAME.ToLowerInvariant()];
}
}
12 changes: 10 additions & 2 deletions src/Helldivers-2-API/Middlewares/RateLimitMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ private bool IsValidRequest(HttpContext context)
if (options.Value.ValidateClients is false || context.Request.Path.StartsWithSegments("/metrics"))
return true;

return context.Request.Headers.ContainsKey(Constants.CLIENT_HEADER_NAME)
&& context.Request.Headers.ContainsKey(Constants.CONTACT_HEADER_NAME);
return HasSuperHeaderOrQuery(context, Constants.CLIENT_HEADER_NAME)
&& HasSuperHeaderOrQuery(context, Constants.CONTACT_HEADER_NAME);
}

private RateLimiter GetRateLimiter(HttpContext http)
Expand Down Expand Up @@ -122,4 +122,12 @@ private async Task RejectRequest(HttpContext context)

await writer.FlushAsync(context.RequestAborted);
}

private bool HasSuperHeaderOrQuery(HttpContext context, string name)
{
if (context.Request.Headers.ContainsKey(name))
return true;

return context.Request.Query.ContainsKey(name.ToLowerInvariant());
}
}