cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-23 21:16:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nullify ApiRootController

Browse Source
This commit is contained in:
Jordan Dominion
2023-11-25 16:25:12 -05:00
parent 92c4e653e4
commit d41f143cf8
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Controllers/ApiRootController.cs
+9 -11
View File
@@ -27,8 +27,6 @@ using Tgstation.Server.Host.Swarm;
using Tgstation.Server.Host.System;
using Tgstation.Server.Host.Utils;
#nullable disable
namespace Tgstation.Server.Host.Controllers
{
/// <summary>
@@ -215,7 +213,7 @@ namespace Tgstation.Server.Host.Controllers
if (ApiHeaders == null)
{
Response.Headers.Add(HeaderNames.WWWAuthenticate, new StringValues($"basic realm=\"Create TGS {ApiHeaders.BearerAuthenticationScheme} token\""));
return HeadersIssue(ApiHeadersProvider.HeadersException);
return HeadersIssue(ApiHeadersProvider.HeadersException!);
}
if (ApiHeaders.IsTokenAuthentication)
@@ -223,12 +221,12 @@ namespace Tgstation.Server.Host.Controllers
var oAuthLogin = ApiHeaders.OAuthProvider.HasValue;
ISystemIdentity systemIdentity = null;
ISystemIdentity? systemIdentity = null;
if (!oAuthLogin)
try
{
// trust the system over the database because a user's name can change while still having the same SID
systemIdentity = await systemIdentityFactory.CreateSystemIdentity(ApiHeaders.Username, ApiHeaders.Password, cancellationToken);
systemIdentity = await systemIdentityFactory.CreateSystemIdentity(ApiHeaders.Username!, ApiHeaders.Password!, cancellationToken);
}
catch (NotImplementedException)
{
@@ -241,8 +239,8 @@ namespace Tgstation.Server.Host.Controllers
IQueryable<Models.User> query = DatabaseContext.Users.AsQueryable();
if (oAuthLogin)
{
var oAuthProvider = ApiHeaders.OAuthProvider.Value;
string externalUserId;
var oAuthProvider = ApiHeaders.OAuthProvider!.Value;
string? externalUserId;
try
{
var validator = oAuthProviders
@@ -313,7 +311,7 @@ namespace Tgstation.Server.Host.Controllers
if (!usingSystemIdentity)
{
// DB User password check and update
if (!isLikelyDbUser || !cryptographySuite.CheckUserPassword(user, ApiHeaders.Password))
if (!isLikelyDbUser || !cryptographySuite.CheckUserPassword(user, ApiHeaders.Password!))
return Unauthorized();
if (user.PasswordHash != originalHash)
{
@@ -329,7 +327,7 @@ namespace Tgstation.Server.Host.Controllers
}
else
{
var usernameMismatch = systemIdentity.Username != user.Name;
var usernameMismatch = systemIdentity!.Username != user.Name;
if (isLikelyDbUser || usernameMismatch)
{
DatabaseContext.Users.Attach(user);
@@ -354,7 +352,7 @@ namespace Tgstation.Server.Host.Controllers
}
// Now that the bookeeping is done, tell them to fuck off if necessary
if (!user.Enabled.Value)
if (!user.Enabled!.Value)
{
Logger.LogTrace("Not logging in disabled user {userId}.", user.Id);
return Forbid();
@@ -367,7 +365,7 @@ namespace Tgstation.Server.Host.Controllers
var identExpiry = token.ParseJwt().ValidTo;
identExpiry += tokenFactory.ValidationParameters.ClockSkew;
identExpiry += TimeSpan.FromSeconds(15);
identityCache.CacheSystemIdentity(user, systemIdentity, identExpiry);
identityCache.CacheSystemIdentity(user, systemIdentity!, identExpiry);
}
Logger.LogDebug("Successfully logged in user {userId}!", user.Id);