Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions fly.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ kill_signal = 'SIGTERM'
auto_stop_machines = true
auto_start_machines = true
min_machines_running = 0
max_machines_running = 1
processes = ['app']

[http_service.concurrency]
Expand All @@ -27,8 +28,8 @@ kill_signal = 'SIGTERM'
soft_limit = 1000

[[http_service.checks]]
grace_period = "2s"
interval = "120s"
grace_period = "10s"
interval = "60s"
method = "GET"
timeout = "10s"
path = "/raw/api/WarSeason/current/WarID"
Expand Down
18 changes: 14 additions & 4 deletions src/Helldivers-2-API/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
using Helldivers.Sync.Configuration;
using Helldivers.Sync.Extensions;
using Microsoft.AspNetCore.Http.Timeouts;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.AspNetCore.Localization;
using System.Globalization;
using System.Net;
using System.Text.Json.Serialization;
using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;

#if DEBUG
// When generating an OpenAPI document, get-document runs with the "--applicationName" flag.
Expand Down Expand Up @@ -66,7 +69,14 @@
});

// Add and configure forwarded headers middleware
builder.Services.Configure<ForwardedHeadersOptions>(_ => { });
builder.Services.Configure<ForwardedHeadersOptions>(options =>
{
options.ForwardLimit = 999;
options.OriginalForHeaderName = "Fly-Client-IP";
options.ForwardedHeaders = ForwardedHeaders.XForwardedFor;
options.KnownNetworks.Add(new IPNetwork(IPAddress.Any, 0));
options.KnownNetworks.Add(new IPNetwork(IPAddress.IPv6Any, 0));
});

// This configuration is bound here so that source generators kick in.
builder.Services.Configure<HelldiversSyncConfiguration>(builder.Configuration.GetSection("Helldivers:Synchronization"));
Expand Down Expand Up @@ -144,12 +154,12 @@
// Ensure web applications can access the API by setting CORS headers.
app.UseCors();

// Handles rate limiting so everyone plays nice
app.UseMiddleware<RateLimitMiddleware>();

// Make sure ASP.NET Core uses the correct addresses internally rather than Fly's proxy
app.UseForwardedHeaders();

// Handles rate limiting so everyone plays nice
app.UseMiddleware<RateLimitMiddleware>();

// Add middleware to timeout requests if they take too long.
app.UseRequestTimeouts();

Expand Down