cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 15:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

More options conversions

Browse Source
This commit is contained in:
Jordan Dominion
2025-08-16 00:38:13 -04:00
parent ff679e902e
commit da38e5d6c6
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Security/TokenFactory.cs
+10 -10
View File
@@ -39,9 +39,9 @@ namespace Tgstation.Server.Host.Security
}
/// <summary>
/// The <see cref="SecurityConfiguration"/> for the <see cref="TokenFactory"/>.
/// The <see cref="IOptions{TOptions}"/> of <see cref="SecurityConfiguration"/> for the <see cref="TokenFactory"/>.
/// </summary>
readonly SecurityConfiguration securityConfiguration;
readonly IOptions<SecurityConfiguration> securityConfigurationOptions;
/// <summary>
/// The <see cref="JwtSecurityTokenHandler"/> used to generate <see cref="TokenResponse.Bearer"/> <see cref="string"/>s.
@@ -63,7 +63,7 @@ namespace Tgstation.Server.Host.Security
/// </summary>
/// <param name="cryptographySuite">The <see cref="ICryptographySuite"/> used for generating the <see cref="ValidationParameters"/>.</param>
/// <param name="assemblyInformationProvider">The <see cref="IAssemblyInformationProvider"/> used to generate the issuer name.</param>
/// <param name="securityConfigurationOptions">The <see cref="IOptions{TOptions}"/> containing the value of <see cref="securityConfiguration"/>.</param>
/// <param name="securityConfigurationOptions">The <see cref="IOptions{TOptions}"/> containing the value of <see cref="securityConfigurationOptions"/>.</param>
public TokenFactory(
ICryptographySuite cryptographySuite,
IAssemblyInformationProvider assemblyInformationProvider,
@@ -72,11 +72,11 @@ namespace Tgstation.Server.Host.Security
ArgumentNullException.ThrowIfNull(cryptographySuite);
ArgumentNullException.ThrowIfNull(assemblyInformationProvider);
securityConfiguration = securityConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(securityConfigurationOptions));
this.securityConfigurationOptions = securityConfigurationOptions ?? throw new ArgumentNullException(nameof(securityConfigurationOptions));
SigningKeyBytes = String.IsNullOrWhiteSpace(securityConfiguration.CustomTokenSigningKeyBase64)
? cryptographySuite.GetSecureBytes(securityConfiguration.TokenSigningKeyByteCount)
: Convert.FromBase64String(securityConfiguration.CustomTokenSigningKeyBase64);
SigningKeyBytes = string.IsNullOrWhiteSpace(securityConfigurationOptions.Value.CustomTokenSigningKeyBase64)
? cryptographySuite.GetSecureBytes(securityConfigurationOptions.Value.TokenSigningKeyByteCount)
: Convert.FromBase64String(securityConfigurationOptions.Value.CustomTokenSigningKeyBase64);
ValidationParameters = new TokenValidationParameters
{
@@ -90,7 +90,7 @@ namespace Tgstation.Server.Host.Security
ValidateAudience = true,
ValidAudience = typeof(TokenResponse).Assembly.GetName().Name,
ClockSkew = TimeSpan.FromMinutes(securityConfiguration.TokenClockSkewMinutes),
ClockSkew = TimeSpan.FromMinutes(securityConfigurationOptions.Value.TokenClockSkewMinutes),
RequireSignedTokens = true,
@@ -122,8 +122,8 @@ namespace Tgstation.Server.Host.Security
notBefore = now;
var expiry = now.AddMinutes(serviceLogin
? securityConfiguration.OAuthTokenExpiryMinutes
: securityConfiguration.TokenExpiryMinutes);
? securityConfigurationOptions.Value.OAuthTokenExpiryMinutes
: securityConfigurationOptions.Value.TokenExpiryMinutes);
var securityToken = new JwtSecurityToken(
tokenHeader,
src/Tgstation.Server.Host/Server.cs
+8 -9
View File
@@ -68,16 +68,16 @@ namespace Tgstation.Server.Host
/// </summary>
readonly object restartLock;
/// <summary>
/// The <see cref="IOptionsMonitor{TOptions}"/> of <see cref="GeneralConfiguration"/> for the <see cref="Server"/>.
/// </summary>
IOptionsMonitor<GeneralConfiguration>? generalConfigurationOptions;
/// <summary>
/// The <see cref="ILogger"/> for the <see cref="Server"/>.
/// </summary>
ILogger<Server>? logger;
/// <summary>
/// The <see cref="GeneralConfiguration"/> for the <see cref="Server"/>.
/// </summary>
GeneralConfiguration? generalConfiguration;
/// <summary>
/// The <see cref="cancellationTokenSource"/> for the <see cref="Server"/>.
/// </summary>
@@ -151,8 +151,7 @@ namespace Tgstation.Server.Host
if (await DumpGraphQLSchemaIfRequested(Host.Services, cancellationToken))
return;
var generalConfigurationOptions = Host.Services.GetRequiredService<IOptions<GeneralConfiguration>>();
generalConfiguration = generalConfigurationOptions.Value;
generalConfigurationOptions = Host.Services.GetRequiredService<IOptionsMonitor<GeneralConfiguration>>();
await Host.RunAsync(cancellationTokenSource.Token);
}
@@ -389,8 +388,8 @@ namespace Tgstation.Server.Host
using var cts = new CancellationTokenSource(
TimeSpan.FromMinutes(
giveHandlersTimeToWaitAround
? generalConfiguration!.ShutdownTimeoutMinutes
: generalConfiguration!.RestartTimeoutMinutes));
? generalConfigurationOptions!.CurrentValue.ShutdownTimeoutMinutes
: generalConfigurationOptions!.CurrentValue.RestartTimeoutMinutes));
var cancellationToken = cts.Token;
try
{