cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-24 13:36:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ApiHeaders improperly storing OAuthCode

Browse Source 
- Store in its own property instead of `Token`
This commit is contained in:
Jordan Dominion
2023-10-29 16:23:00 -04:00
parent 4b39bde25d
commit 590f5c6a55
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Api/ApiHeaders.cs
+10 -9
View File
@@ -112,6 +112,11 @@ namespace Tgstation.Server.Api
/// </summary>
public string? Password { get; }
/// <summary>
/// The OAuth code in use.
/// </summary>
public string? OAuthCode { get; }
/// <summary>
/// The <see cref="Models.OAuthProvider"/> the <see cref="Token"/> is for, if any.
/// </summary>
@@ -122,11 +127,6 @@ namespace Tgstation.Server.Api
/// </summary>
public bool IsTokenAuthentication => Token != null && !OAuthProvider.HasValue;
/// <summary>
/// The OAuth code in use.
/// </summary>
readonly string? oAuthCode;
/// <summary>
/// Checks if a given <paramref name="otherVersion"/> is compatible with our own.
/// </summary>
@@ -154,7 +154,7 @@ namespace Tgstation.Server.Api
/// Initializes a new instance of the <see cref="ApiHeaders"/> class. Used for token authentication.
/// </summary>
/// <param name="userAgent">The value of <see cref="UserAgent"/>.</param>
/// <param name="oAuthCode">The value of <see cref="oAuthCode"/>.</param>
/// <param name="oAuthCode">The value of <see cref="OAuthCode"/>.</param>
/// <param name="oAuthProvider">The value of <see cref="OAuthProvider"/>.</param>
public ApiHeaders(ProductHeaderValue userAgent, string oAuthCode, OAuthProvider oAuthProvider)
: this(userAgent, null, null, null)
@@ -162,7 +162,7 @@ namespace Tgstation.Server.Api
if (userAgent == null)
throw new ArgumentNullException(nameof(userAgent));
this.oAuthCode = oAuthCode ?? throw new ArgumentNullException(nameof(oAuthCode));
OAuthCode = oAuthCode ?? throw new ArgumentNullException(nameof(oAuthCode));
OAuthProvider = oAuthProvider;
}
@@ -267,7 +267,8 @@ namespace Tgstation.Server.Api
else
AddError(HeaderTypes.OAuthProvider, $"Missing {OAuthProviderHeader} header!");
goto case BearerAuthenticationScheme;
OAuthCode = parameter;
break;
case BearerAuthenticationScheme:
var tokenSplits = parameter.Split('.');
DateTimeOffset? expiresAt = null;
@@ -379,7 +380,7 @@ namespace Tgstation.Server.Api
headers.Add(ApiVersionHeader, CreateApiVersionHeader());
if (OAuthProvider.HasValue)
{
headers.Authorization = new AuthenticationHeaderValue(OAuthAuthenticationScheme, Token!.Bearer);
headers.Authorization = new AuthenticationHeaderValue(OAuthAuthenticationScheme, OAuthCode!);
headers.Add(OAuthProviderHeader, OAuthProvider.ToString());
}
else if (!IsTokenAuthentication)
src/Tgstation.Server.Host/Controllers/HomeController.cs
+1 -1
View File
@@ -261,7 +261,7 @@ namespace Tgstation.Server.Host.Controllers
return BadRequest(new ErrorMessageResponse(ErrorCode.OAuthProviderDisabled));
externalUserId = await validator
.ValidateResponseCode(ApiHeaders.Token.Bearer!, cancellationToken);
.ValidateResponseCode(ApiHeaders.OAuthCode!, cancellationToken);
Logger.LogTrace("External {oAuthProvider} UID: {externalUserId}", oAuthProvider, externalUserId);
}