Updated deploy script, and reduced logging noise
This commit is contained in:
@@ -41,14 +41,32 @@ var connStr = builder.Configuration.GetConnectionString("DefaultConnection")
|
||||
$"Username={builder.Configuration["POSTGRES_USER"] ?? "budget"};" +
|
||||
$"Password={builder.Configuration["POSTGRES_PASSWORD"] ?? "changeme"}";
|
||||
|
||||
builder.Services.AddDbContext<AppDbContext>(opt => opt.UseNpgsql(connStr));
|
||||
builder.Services.AddSingleton<Budget.Infrastructure.Data.SlowQueryInterceptor>();
|
||||
builder.Services.AddDbContext<AppDbContext>((sp, opt) =>
|
||||
{
|
||||
opt.UseNpgsql(connStr);
|
||||
opt.AddInterceptors(sp.GetRequiredService<Budget.Infrastructure.Data.SlowQueryInterceptor>());
|
||||
});
|
||||
|
||||
builder.Services.Configure<ForwardedHeadersOptions>(options =>
|
||||
{
|
||||
options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
|
||||
options.KnownProxies.Clear();
|
||||
options.ForwardedHeaders = ForwardedHeaders.XForwardedFor
|
||||
| ForwardedHeaders.XForwardedProto
|
||||
| ForwardedHeaders.XForwardedHost;
|
||||
|
||||
options.KnownIPNetworks.Clear();
|
||||
options.KnownIPNetworks.Add(System.Net.IPNetwork.Parse("172.20.0.0/16"));
|
||||
options.KnownProxies.Clear();
|
||||
|
||||
var trustedNetworks = builder.Configuration["Budget:TrustedProxyNetworks"] ?? "172.16.0.0/12";
|
||||
foreach (var cidr in trustedNetworks.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
|
||||
{
|
||||
var parts = cidr.Split('/');
|
||||
var prefix = System.Net.IPAddress.Parse(parts[0]);
|
||||
var prefixLength = parts.Length > 1
|
||||
? int.Parse(parts[1])
|
||||
: (prefix.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6 ? 128 : 32);
|
||||
options.KnownIPNetworks.Add(new System.Net.IPNetwork(prefix, prefixLength));
|
||||
}
|
||||
});
|
||||
|
||||
var oidc = builder.Configuration.GetSection("Oidc");
|
||||
@@ -127,6 +145,8 @@ while (true)
|
||||
jwtOpts.ConfigurationManager!.RequestRefresh();
|
||||
await jwtOpts.ConfigurationManager!.GetConfigurationAsync(CancellationToken.None);
|
||||
startupLogger.LogInformation("OIDC discovery succeeded");
|
||||
startupLogger.LogInformation("Trusted proxy networks: {Networks}",
|
||||
app.Configuration["Budget:TrustedProxyNetworks"] ?? "172.16.0.0/12 (default)");
|
||||
break;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
Reference in New Issue
Block a user