Skip to content

fix: NullReferenceException when non-member joins channel via SignalR #1530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kuu-26 wants to merge 1 commit into
base: main
Choose a base branch
from
+164 −159
Open

fix: NullReferenceException when non-member joins channel via SignalR #1530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
323 changes: 164 additions & 159 deletions Valour/Server/Hubs/CoreHub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
using Microsoft.AspNetCore.SignalR;
using Microsoft.AspNetCore.SignalR;
using StackExchange.Redis;
using Valour.Shared.Authorization;
using Valour.Shared;
using Valour.Server.Hubs;
/* Valour (TM) - A free and secure chat client
* Copyright (C) 2025 Valour Software LLC
* This program is subject to the GNU Affero General Public license
* A copy of the license should be included - if not, see <http://www.gnu.org/licenses/>
*/
namespace Valour.Server.Hubs;
public class CoreHub : Hub
{
public const string HubUrl = "/hubs/core";

/* Valour (TM) - A free and secure chat client
* Copyright (C) 2025 Valour Software LLC
* This program is subject to the GNU Affero General Public license
* A copy of the license should be included - if not, see <http://www.gnu.org/licenses/>
*/

namespace Valour.Server.Hubs;

public class CoreHub : Hub
{
public const string HubUrl = "/hubs/core";

private readonly ValourDb _db;
private readonly CoreHubService _hubService;
private readonly PlanetMemberService _memberService;
Expand All @@ -24,8 +24,8 @@ public class CoreHub : Hub
private readonly IConnectionMultiplexer _redis;
private readonly SignalRConnectionService _connectionTracker;
private readonly UserOnlineQueueService _onlineQueue;
public CoreHub(

public CoreHub(
ValourDb db,
CoreHubService hubService,
PlanetMemberService memberService,
Expand All @@ -44,117 +44,122 @@ public CoreHub(
_tokenService = tokenService;
_onlineQueue = onlineQueue;
}

public async Task<TaskResult> Authorize(string token)
{
// Authenticate user
var authToken = await _tokenService.GetAsync(token);

var result = new TaskResult(false, "Failed to authenticate connection.");
result.Code = 401;

if (authToken is null)
return result;

_connectionTracker.AddConnectionIdentity(Context.ConnectionId, authToken);

return new TaskResult(true, "Authenticated with SignalR hub successfully.");
}

public override async Task OnDisconnectedAsync(Exception exception)
{
await _connectionTracker.RemovePrimaryConnectionAsync(Context, _redis);
await _connectionTracker.RemoveAllMembershipsAsync(Context);

await base.OnDisconnectedAsync(exception);
}

/// <summary>
/// Primary node connection for user-wide events
/// </summary>
public async Task<TaskResult> JoinUser(bool isPrimary)
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return new TaskResult(false, "Failed to connect to User: SignalR was not authenticated.");

var groupId = $"u-{authToken.UserId}";

await _connectionTracker.TrackGroupMembershipAsync(groupId, Context);

if (isPrimary)
await _connectionTracker.AddPrimaryConnectionAsync(authToken.UserId, Context, _redis);

await Groups.AddToGroupAsync(Context.ConnectionId, groupId);

return new TaskResult(true, "Connected to user " + groupId);
}

public async Task LeaveUser()
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return;

var groupId = $"u-{authToken.UserId}";

await _connectionTracker.UntrackGroupMembershipAsync(groupId, Context);
await _connectionTracker.RemovePrimaryConnectionAsync(Context, _redis);

await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupId);
}

public async Task<TaskResult> JoinPlanet(long planetId)
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return new TaskResult(false, "Failed to connect to Planet: SignalR was not authenticated.");

PlanetMember member = await _memberService.GetByUserAsync(authToken.UserId, planetId);

// If the user is not a member, cancel
if (member == null)
{
return new TaskResult(false, "Failed to connect to Planet: You are not a member.");
}

var groupId = $"p-{planetId}";
await _connectionTracker.TrackGroupMembershipAsync(groupId, Context);

// Add to planet group
await Groups.AddToGroupAsync(Context.ConnectionId, groupId);


return new TaskResult(true, "Connected to planet " + planetId);
}

public async Task<TaskResult> LeavePlanet(long planetId) {
var groupId = $"p-{planetId}";
await _connectionTracker.UntrackGroupMembershipAsync(groupId, Context);
await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupId);

return TaskResult.SuccessResult;
}


public async Task<TaskResult> JoinChannel(long channelId)
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return new TaskResult(false, "Failed to connect to Channel: SignalR was not authenticated.");

// Grab channel
var channel = await _db.Channels.FindAsync(channelId);
if (channel is null)
return new TaskResult(false, "Failed to connect to Channel: Channel was not found.");

PlanetMember member = (await _db.PlanetMembers.FirstOrDefaultAsync(
x => x.UserId == authToken.UserId && x.PlanetId == channel.PlanetId)).ToModel();

if (!await _memberService.HasPermissionAsync(member, channel.ToModel(), ChatChannelPermissions.ViewMessages))
return new TaskResult(false, "Failed to connect to Channel: Member lacks view permissions.");

var groupId = $"c-{channelId}";

await _connectionTracker.TrackGroupMembershipAsync(groupId, Context);
await Groups.AddToGroupAsync(Context.ConnectionId, groupId);


public async Task<TaskResult> Authorize(string token)
{
// Authenticate user
var authToken = await _tokenService.GetAsync(token);

var result = new TaskResult(false, "Failed to authenticate connection.");
result.Code = 401;

if (authToken is null)
return result;

_connectionTracker.AddConnectionIdentity(Context.ConnectionId, authToken);

return new TaskResult(true, "Authenticated with SignalR hub successfully.");
}

public override async Task OnDisconnectedAsync(Exception exception)
{
await _connectionTracker.RemovePrimaryConnectionAsync(Context, _redis);
await _connectionTracker.RemoveAllMembershipsAsync(Context);

await base.OnDisconnectedAsync(exception);
}

/// <summary>
/// Primary node connection for user-wide events
/// </summary>
public async Task<TaskResult> JoinUser(bool isPrimary)
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return new TaskResult(false, "Failed to connect to User: SignalR was not authenticated.");

var groupId = $"u-{authToken.UserId}";

await _connectionTracker.TrackGroupMembershipAsync(groupId, Context);

if (isPrimary)
await _connectionTracker.AddPrimaryConnectionAsync(authToken.UserId, Context, _redis);

await Groups.AddToGroupAsync(Context.ConnectionId, groupId);

return new TaskResult(true, "Connected to user " + groupId);
}

public async Task LeaveUser()
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return;

var groupId = $"u-{authToken.UserId}";

await _connectionTracker.UntrackGroupMembershipAsync(groupId, Context);
await _connectionTracker.RemovePrimaryConnectionAsync(Context, _redis);

await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupId);
}

public async Task<TaskResult> JoinPlanet(long planetId)
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return new TaskResult(false, "Failed to connect to Planet: SignalR was not authenticated.");

PlanetMember member = await _memberService.GetByUserAsync(authToken.UserId, planetId);

// If the user is not a member, cancel
if (member == null)
{
return new TaskResult(false, "Failed to connect to Planet: You are not a member.");
}

var groupId = $"p-{planetId}";
await _connectionTracker.TrackGroupMembershipAsync(groupId, Context);

// Add to planet group
await Groups.AddToGroupAsync(Context.ConnectionId, groupId);


return new TaskResult(true, "Connected to planet " + planetId);
}

public async Task<TaskResult> LeavePlanet(long planetId) {
var groupId = $"p-{planetId}";
await _connectionTracker.UntrackGroupMembershipAsync(groupId, Context);
await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupId);

return TaskResult.SuccessResult;
}


public async Task<TaskResult> JoinChannel(long channelId)
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return new TaskResult(false, "Failed to connect to Channel: SignalR was not authenticated.");

// Grab channel
var channel = await _db.Channels.FindAsync(channelId);
if (channel is null)
return new TaskResult(false, "Failed to connect to Channel: Channel was not found.");

var dbMember = await _db.PlanetMembers.FirstOrDefaultAsync(
x => x.UserId == authToken.UserId && x.PlanetId == channel.PlanetId);

if (dbMember is null)
return new TaskResult(false, "Failed to connect to Channel: You are not a member of this planet.");

PlanetMember member = dbMember.ToModel();

if (!await _memberService.HasPermissionAsync(member, channel.ToModel(), ChatChannelPermissions.ViewMessages))
return new TaskResult(false, "Failed to connect to Channel: Member lacks view permissions.");

var groupId = $"c-{channelId}";

await _connectionTracker.TrackGroupMembershipAsync(groupId, Context);
await Groups.AddToGroupAsync(Context.ConnectionId, groupId);

var updatedState = await _unreadService.UpdateReadState(
channelId,
authToken.UserId,
Expand All @@ -163,37 +168,37 @@ public async Task<TaskResult> JoinChannel(long channelId)
DateTime.UtcNow);

_hubService.NotifyUserChannelStateUpdate(authToken.UserId, updatedState);
return new TaskResult(true, "Connected to channel " + channelId);
}
public async Task<TaskResult> LeaveChannel(long channelId) {
var groupId = $"c-{channelId}";
await _connectionTracker.UntrackGroupMembershipAsync(groupId, Context);
await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupId);
return TaskResult.SuccessResult;
}
public async Task JoinInteractionGroup(long planetId)
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return;
PlanetMember member = await _memberService.GetByUserAsync(authToken.UserId, planetId);
// If the user is not a member, cancel
if (member == null)
return;
// Add to planet group
await Groups.AddToGroupAsync(Context.ConnectionId, $"i-{planetId}");
}
public async Task LeaveInteractionGroup(long planetId) =>
await Groups.RemoveFromGroupAsync(Context.ConnectionId, $"i-{planetId}");

return new TaskResult(true, "Connected to channel " + channelId);
}

public async Task<TaskResult> LeaveChannel(long channelId) {
var groupId = $"c-{channelId}";
await _connectionTracker.UntrackGroupMembershipAsync(groupId, Context);
await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupId);

return TaskResult.SuccessResult;
}


public async Task JoinInteractionGroup(long planetId)
{
var authToken = _connectionTracker.GetToken(Context.ConnectionId);
if (authToken == null) return;

PlanetMember member = await _memberService.GetByUserAsync(authToken.UserId, planetId);

// If the user is not a member, cancel
if (member == null)
return;

// Add to planet group
await Groups.AddToGroupAsync(Context.ConnectionId, $"i-{planetId}");
}

public async Task LeaveInteractionGroup(long planetId) =>
await Groups.RemoveFromGroupAsync(Context.ConnectionId, $"i-{planetId}");

public Task<string> Ping(bool userState = false)
{
if (userState)
Expand All @@ -208,4 +213,4 @@ public Task<string> Ping(bool userState = false)
return Task.FromResult("pong");
}
}