-
-
Notifications
You must be signed in to change notification settings - Fork 5
SF-3730 Require authentication for SignalR notifications #3735
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,10 @@ | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Authorization; | ||
| using Microsoft.AspNetCore.SignalR; | ||
| using SIL.XForge.Scripture.Models; | ||
| using SIL.XForge.Realtime; | ||
|
|
||
| namespace SIL.XForge.Scripture.Services; | ||
|
|
||
| [Authorize] | ||
| public class DraftNotificationHub : Hub<IDraftNotifier>, IDraftNotifier | ||
| { | ||
| /// <summary> | ||
| /// Notifies subscribers to a project of draft application progress. | ||
| /// </summary> | ||
| /// <param name="projectId">The Scripture Forge project identifier.</param> | ||
| /// <param name="draftApplyState">The state of the draft being applied.</param> | ||
| /// <returns>The asynchronous task.</returns> | ||
| /// <remarks> | ||
| /// This differs from the implementation in <see cref="NotificationHub"/> in that this version | ||
| /// does have stateful reconnection, and so there is a guarantee that it is received by clients. | ||
| /// | ||
| /// This is a blocking operation if the stateful reconnection buffer is full, so it should only | ||
| /// be subscribed to by the user performing the draft import. Using <see cref="NotificationHub"/> | ||
| /// is sufficient for all other users to subscribe to, although they will not receive all draft | ||
| /// progress notifications, only the final success message. | ||
| /// </remarks> | ||
| public async Task NotifyDraftApplyProgress(string projectId, DraftApplyState draftApplyState) => | ||
| await Clients.Group(projectId).NotifyDraftApplyProgress(projectId, draftApplyState); | ||
|
|
||
| /// <summary> | ||
| /// Subscribe to notifications for a project. | ||
| /// | ||
| /// This is called from the frontend via <c>project-notification.service.ts</c>. | ||
| /// </summary> | ||
| /// <param name="projectId">The Scripture Forge project identifier.</param> | ||
| /// <returns>The asynchronous task.</returns> | ||
| public async Task SubscribeToProject(string projectId) => | ||
| await Groups.AddToGroupAsync(Context.ConnectionId, projectId); | ||
| } | ||
| /// <summary> | ||
| /// The SignalR notification hub for apply draft notifications. | ||
| /// </summary> | ||
| /// <param name="realtimeService">The realtime service.</param> | ||
| public class DraftNotificationHub(IRealtimeService realtimeService) | ||
| : NotificationHubBase<IDraftNotifier>(realtimeService) { } | ||
|
devin-ai-integration[bot] marked this conversation as resolved.
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,9 @@ | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Authorization; | ||
| using Microsoft.AspNetCore.SignalR; | ||
| using SIL.XForge.Scripture.Models; | ||
| using SIL.XForge.Realtime; | ||
|
|
||
| namespace SIL.XForge.Scripture.Services; | ||
|
|
||
| [Authorize] | ||
| public class NotificationHub : Hub<INotifier>, INotifier | ||
| { | ||
| /// <summary> | ||
| /// Notifies subscribers to a project of draft build progress. | ||
| /// </summary> | ||
| /// <param name="projectId">The Scripture Forge project identifier.</param> | ||
| /// <param name="buildState">The build state from Serval.</param> | ||
| /// <returns>The asynchronous task.</returns> | ||
| /// <remarks> | ||
| /// This will currently be emitted on the TranslationBuildStarted and TranslationBuildFinished webhooks, | ||
| /// and when the draft pre-translations have been retrieved. | ||
| /// </remarks> | ||
| public async Task NotifyBuildProgress(string projectId, ServalBuildState buildState) => | ||
| await Clients.Group(projectId).NotifyBuildProgress(projectId, buildState); | ||
|
|
||
| /// <summary> | ||
| /// Notifies subscribers to a project of draft application progress. | ||
| /// </summary> | ||
| /// <param name="projectId">The Scripture Forge project identifier.</param> | ||
| /// <param name="draftApplyState">The state of the draft being applied.</param> | ||
| /// <returns>The asynchronous task.</returns> | ||
| /// <remarks> | ||
| /// This differs from the implementation in <see cref="DraftNotificationHub"/> in that this version | ||
| /// does not have stateful reconnection, and so there is no guarantee that the message is received. | ||
| /// </remarks> | ||
| public async Task NotifyDraftApplyProgress(string projectId, DraftApplyState draftApplyState) => | ||
| await Clients.Group(projectId).NotifyDraftApplyProgress(projectId, draftApplyState); | ||
|
|
||
| /// <summary> | ||
| /// Notifies subscribers to a project of sync progress. | ||
| /// </summary> | ||
| /// <param name="projectId">The Scripture Forge project identifier.</param> | ||
| /// <param name="progressState"> | ||
| /// The progress state, including a string value (Paratext only - not used in SF), or percentage value. | ||
| /// </param> | ||
| /// <returns>The asynchronous task.</returns> | ||
| public async Task NotifySyncProgress(string projectId, ProgressState progressState) => | ||
| await Clients.Group(projectId).NotifySyncProgress(projectId, progressState); | ||
|
|
||
| /// <summary> | ||
| /// Subscribe to notifications for a project. | ||
| /// | ||
| /// This is called from the frontend via <c>project-notification.service.ts</c>. | ||
| /// </summary> | ||
| /// <param name="projectId">The Scripture Forge project identifier.</param> | ||
| /// <returns>The asynchronous task.</returns> | ||
| public async Task SubscribeToProject(string projectId) => | ||
| await Groups.AddToGroupAsync(Context.ConnectionId, projectId); | ||
| } | ||
| /// <summary> | ||
| /// The SignalR notification hub for sync and draft notifications. | ||
| /// </summary> | ||
| /// <param name="realtimeService">The realtime service.</param> | ||
| public class NotificationHub(IRealtimeService realtimeService) : NotificationHubBase<INotifier>(realtimeService) { } | ||
|
devin-ai-integration[bot] marked this conversation as resolved.
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| using System; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Authorization; | ||
| using Microsoft.AspNetCore.SignalR; | ||
| using SIL.XForge.Realtime; | ||
| using SIL.XForge.Scripture.Models; | ||
| using SIL.XForge.Services; | ||
| using SIL.XForge.Utils; | ||
|
|
||
| namespace SIL.XForge.Scripture.Services; | ||
|
|
||
| /// <summary> | ||
| /// Base class for SignalR notification hubs, providing shared project subscription and | ||
| /// permission checking to ensure only authorized users with Paratext roles receive notifications. | ||
| /// </summary> | ||
| [Authorize] | ||
| public abstract class NotificationHubBase<T>(IRealtimeService realtimeService) : Hub<T> | ||
| where T : class | ||
| { | ||
| /// <summary> | ||
| /// Subscribe to notifications for a project. | ||
| /// | ||
| /// This is called from the frontend via <c>project-notification.service.ts</c>. | ||
| /// </summary> | ||
| /// <param name="projectId">The Scripture Forge project identifier.</param> | ||
| /// <returns>The asynchronous task.</returns> | ||
| public async Task SubscribeToProject(string projectId) | ||
| { | ||
| await EnsurePermissionAsync(projectId); | ||
| await Groups.AddToGroupAsync(Context.ConnectionId, projectId); | ||
| } | ||
|
devin-ai-integration[bot] marked this conversation as resolved.
devin-ai-integration[bot] marked this conversation as resolved.
|
||
|
|
||
| /// <summary> | ||
| /// Ensures that the user has permission to access the project for SignalR notifications. | ||
| /// </summary> | ||
| /// <param name="projectId">The Scripture Forge project identifier.</param> | ||
| /// <exception cref="DataNotFoundException">The project does not exist.</exception> | ||
| /// <exception cref="ForbiddenException"> | ||
| /// The user does not have permission to access the project. | ||
| /// </exception> | ||
| protected async Task EnsurePermissionAsync(string projectId) | ||
| { | ||
| // Load the project from the realtime service | ||
| Attempt<SFProject> attempt = await realtimeService.TryGetSnapshotAsync<SFProject>(projectId); | ||
| if (!attempt.TryResult(out SFProject project)) | ||
| { | ||
| throw new DataNotFoundException("The project does not exist."); | ||
| } | ||
|
|
||
| // Retrieve the user identifier | ||
| string? userId = Context.GetHttpContext()?.User.FindFirst(XFClaimTypes.UserId)?.Value; | ||
| if (string.IsNullOrWhiteSpace(userId)) | ||
| { | ||
| throw new UnauthorizedAccessException(); | ||
| } | ||
|
|
||
| // Ensure the user is on the project, and has a Paratext role | ||
| if (!project.UserRoles.TryGetValue(userId, out string? role) || !SFProjectRole.IsParatextRole(role)) | ||
| { | ||
| throw new ForbiddenException(); | ||
| } | ||
|
pmachapman marked this conversation as resolved.
|
||
| } | ||
|
devin-ai-integration[bot] marked this conversation as resolved.
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.