cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-20 19:47:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2174 from tgstation/ASKDJASKLDJALSD [TGSDeploy]

Browse Source 
v6.15.2: Fix `X-Forwarded-*` headers again
This commit is contained in:
Jordan Dominion
2025-03-20 05:12:23 -04:00
committed by GitHub
parent 768ffa4c96 5d2f531030
commit 08e4b9b2c8
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="WebpanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>6.15.1</TgsCoreVersion>
<TgsCoreVersion>6.15.2</TgsCoreVersion>
<TgsConfigVersion>5.6.0</TgsConfigVersion>
<TgsRestVersion>10.13.0</TgsRestVersion>
<TgsGraphQLVersion>0.6.0</TgsGraphQLVersion>
src/Tgstation.Server.Host/Authority/UserAuthority.cs
+3
View File
@@ -495,7 +495,9 @@ namespace Tgstation.Server.Host.Authority
if (model.OAuthConnections.Count == 0 && originalUser.PasswordHash == null && originalUser.SystemIdentifier == null)
return BadRequest<User>(ErrorCode.CannotRemoveLastAuthenticationOption);
DatabaseContext.OAuthConnections.RemoveRange(originalUser.OAuthConnections);
originalUser.OAuthConnections.Clear();
foreach (var updatedConnection in model.OAuthConnections)
originalUser.OAuthConnections.Add(new Models.OAuthConnection
{
@@ -517,6 +519,7 @@ namespace Tgstation.Server.Host.Authority
if (model.OidcConnections.Count == 0 && originalUser.PasswordHash == null && originalUser.SystemIdentifier == null)
return BadRequest<User>(ErrorCode.CannotRemoveLastAuthenticationOption);
DatabaseContext.OidcConnections.RemoveRange(originalUser.OidcConnections);
originalUser.OidcConnections.Clear();
foreach (var updatedConnection in model.OidcConnections)
originalUser.OidcConnections.Add(new Models.OidcConnection
src/Tgstation.Server.Host/Core/Application.cs
+10 -2
View File
@@ -619,10 +619,18 @@ namespace Tgstation.Server.Host.Core
applicationBuilder.UseServerErrorHandling();
// header forwarding important for OIDC
applicationBuilder.UseForwardedHeaders(new ForwardedHeadersOptions
var forwardedHeaderOptions = new ForwardedHeadersOptions
{
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost,
});
};
forwardedHeaderOptions.KnownNetworks.Clear();
forwardedHeaderOptions.KnownNetworks.Add(
new IPNetwork(
global::System.Net.IPAddress.Any,
0));
applicationBuilder.UseForwardedHeaders(forwardedHeaderOptions);
// metrics capture
applicationBuilder.UseHttpMetrics();