mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-25 14:06:41 +01:00
Crossedfall test 5
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@
|
||||
<!-- Integration tests will ensure they match across the board -->
|
||||
<Import Project="WebpanelVersion.props" />
|
||||
<PropertyGroup>
|
||||
<TgsCoreVersion>6.15.104</TgsCoreVersion>
|
||||
<TgsCoreVersion>6.15.105</TgsCoreVersion>
|
||||
<TgsConfigVersion>5.6.0</TgsConfigVersion>
|
||||
<TgsRestVersion>10.13.0</TgsRestVersion>
|
||||
<TgsGraphQLVersion>0.6.0</TgsGraphQLVersion>
|
||||
|
||||
@@ -577,7 +577,6 @@ namespace Tgstation.Server.Host.Core
|
||||
/// <param name="swarmConfigurationOptions">The <see cref="IOptions{TOptions}"/> containing the <see cref="SwarmConfiguration"/> to use.</param>
|
||||
/// <param name="internalConfigurationOptions">The <see cref="IOptions{TOptions}"/> containing the <see cref="InternalConfiguration"/> to use.</param>
|
||||
/// <param name="logger">The <see cref="Microsoft.Extensions.Logging.ILogger"/> for the <see cref="Application"/>.</param>
|
||||
#pragma warning disable
|
||||
public void Configure(
|
||||
IApplicationBuilder applicationBuilder,
|
||||
IServerControl serverControl,
|
||||
@@ -619,22 +618,10 @@ namespace Tgstation.Server.Host.Core
|
||||
// Wrap exceptions in a 500 (ErrorMessage) response
|
||||
applicationBuilder.UseServerErrorHandling();
|
||||
|
||||
applicationBuilder.Use((context, next) =>
|
||||
{
|
||||
logger.LogDebug("Crossedfall Pre middleware:");
|
||||
foreach (var header in context.Request.Headers)
|
||||
{
|
||||
logger.LogDebug("{header}: {value}", header.Key, header.Value);
|
||||
}
|
||||
|
||||
return next();
|
||||
});
|
||||
|
||||
// header forwarding important for OIDC
|
||||
var forwardedHeaderOptions = new ForwardedHeadersOptions
|
||||
{
|
||||
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost,
|
||||
AllowedHosts = null,
|
||||
};
|
||||
|
||||
forwardedHeaderOptions.KnownNetworks.Clear();
|
||||
@@ -645,22 +632,6 @@ namespace Tgstation.Server.Host.Core
|
||||
|
||||
applicationBuilder.UseForwardedHeaders(forwardedHeaderOptions);
|
||||
|
||||
applicationBuilder.Use((context, next) =>
|
||||
{
|
||||
logger.LogDebug("Crossedfall Post middleware:");
|
||||
foreach (var header in context.Request.Headers)
|
||||
{
|
||||
logger.LogDebug("{header}: {value}", header.Key, header.Value);
|
||||
}
|
||||
|
||||
return next();
|
||||
});
|
||||
|
||||
/*applicationBuilder.UseForwardedHeaders(new ForwardedHeadersOptions
|
||||
{
|
||||
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost,
|
||||
});*/
|
||||
|
||||
// metrics capture
|
||||
applicationBuilder.UseHttpMetrics();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user