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

Nullify AuthorizationContextHubFilter

Browse Source
This commit is contained in:
Jordan Dominion
2023-11-24 15:23:50 -05:00
parent c269fbd57c
commit 760bc8b29a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Security/AuthorizationContextHubFilter.cs
+5 -5
View File
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Logging;
#nullable disable
using Tgstation.Server.Host.Models;
namespace Tgstation.Server.Host.Security
{
@@ -46,7 +46,7 @@ namespace Tgstation.Server.Host.Security
}
/// <inheritdoc />
public async ValueTask<object> InvokeMethodAsync(HubInvocationContext invocationContext, Func<HubInvocationContext, ValueTask<object>> next)
public async ValueTask<object?> InvokeMethodAsync(HubInvocationContext invocationContext, Func<HubInvocationContext, ValueTask<object?>> next)
{
ArgumentNullException.ThrowIfNull(invocationContext);
if (ValidateAuthenticationContext(invocationContext.Hub))
@@ -64,7 +64,7 @@ namespace Tgstation.Server.Host.Security
{
if (!authenticationContext.Valid)
logger.LogTrace("The token for connection {connectionId} is no longer authenticated! Aborting...", hub.Context.ConnectionId);
else if (!authenticationContext.User.Enabled.Value)
else if (!authenticationContext.User.Require(x => x.Enabled))
logger.LogTrace("The token for connection {connectionId} is no longer authorized! Aborting...", hub.Context.ConnectionId);
else
return true;
@@ -75,8 +75,8 @@ namespace Tgstation.Server.Host.Security
prop => prop.PropertyType.IsConstructedGenericType
&& prop.Name == nameof(hub.Clients));
var clients = typedClientsProperty.GetValue(hub);
var callerProperty = clients.GetType().GetProperty(nameof(hub.Clients.Caller));
var caller = callerProperty.GetValue(clients);
var callerProperty = clients!.GetType().GetProperty(nameof(hub.Clients.Caller));
var caller = callerProperty!.GetValue(clients);
hub.Context.Abort();
return false;