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

Merge pull request #1626 from tgstation/TokenFactoryCleanup

Browse Source 
Remove redundant allocations from `TokenFactory`
This commit is contained in:
Jordan Dominion
2023-08-14 09:32:30 -04:00
committed by GitHub
parent 42285c9f6a f40b45c424
commit ca5fc05c22
1 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Security/TokenFactory.cs
+40 -7
View File
@@ -26,6 +26,26 @@ namespace Tgstation.Server.Host.Security
/// </summary>
readonly SecurityConfiguration securityConfiguration;
/// <summary>
/// The <see cref="JwtRegisteredClaimNames.Iss"/> claim.
/// </summary>
readonly Claim issuerClaim;
/// <summary>
/// The <see cref="JwtRegisteredClaimNames.Aud"/> claim.
/// </summary>
readonly Claim audienceClaim;
/// <summary>
/// The <see cref="JwtHeader"/> for generating tokens.
/// </summary>
readonly JwtHeader tokenHeader;
/// <summary>
/// The <see cref="JwtSecurityTokenHandler"/> used to generate <see cref="TokenResponse.Bearer"/> <see cref="string"/>s.
/// </summary>
readonly JwtSecurityTokenHandler tokenHandler;
/// <summary>
/// The <see cref="IAsyncDelayer"/> for the <see cref="TokenFactory"/>.
/// </summary>
@@ -73,6 +93,14 @@ namespace Tgstation.Server.Host.Security
RequireExpirationTime = true,
};
issuerClaim = new Claim(JwtRegisteredClaimNames.Iss, ValidationParameters.ValidIssuer);
audienceClaim = new Claim(JwtRegisteredClaimNames.Aud, ValidationParameters.ValidAudience);
tokenHeader = new JwtHeader(
new SigningCredentials(
ValidationParameters.IssuerSigningKey,
SecurityAlgorithms.HmacSha256));
tokenHandler = new JwtSecurityTokenHandler();
}
/// <inheritdoc />
@@ -88,8 +116,8 @@ namespace Tgstation.Server.Host.Security
// since unix time rounds down, it looks like it came from before the user changed their password
// this happens occasionally in unit tests
// just delay a second so we can force a round up
var lpuUnix = user.LastPasswordUpdate?.ToUnixTimeSeconds();
if (nowUnix == lpuUnix)
var userLastPassworUpdateUnix = user.LastPasswordUpdate?.ToUnixTimeSeconds();
if (nowUnix == userLastPassworUpdateUnix)
await asyncDelayer.Delay(TimeSpan.FromSeconds(1), cancellationToken);
var expiry = now.AddMinutes(oAuth
@@ -100,16 +128,21 @@ namespace Tgstation.Server.Host.Security
new Claim(JwtRegisteredClaimNames.Sub, user.Id.Value.ToString(CultureInfo.InvariantCulture)),
new Claim(JwtRegisteredClaimNames.Exp, expiry.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture)),
new Claim(JwtRegisteredClaimNames.Nbf, nowUnix.ToString(CultureInfo.InvariantCulture)),
new Claim(JwtRegisteredClaimNames.Iss, ValidationParameters.ValidIssuer),
new Claim(JwtRegisteredClaimNames.Aud, ValidationParameters.ValidAudience),
issuerClaim,
audienceClaim,
};
var token = new JwtSecurityToken(new JwtHeader(new SigningCredentials(ValidationParameters.IssuerSigningKey, SecurityAlgorithms.HmacSha256)), new JwtPayload(claims));
return new TokenResponse
var securityToken = new JwtSecurityToken(
tokenHeader,
new JwtPayload(claims));
var tokenResponse = new TokenResponse
{
Bearer = new JwtSecurityTokenHandler().WriteToken(token),
Bearer = tokenHandler.WriteToken(securityToken),
ExpiresAt = expiry,
};
return tokenResponse;
}
}
}