Fix data leakage between sessions, fixes #15

Sebazzz · Apr 16, 2020 · 41396fa · 41396fa
1 parent fa9139a
commit 41396fa
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 16 deletions.
diff --git a/src/PokerTime.Application/Notifications/EstimationGiven/EstimationGivenNotification.cs b/src/PokerTime.Application/Notifications/EstimationGiven/EstimationGivenNotification.cs
@@ -12,7 +12,10 @@ namespace PokerTime.Application.Notifications.EstimationGiven {
     public sealed class EstimationGivenNotification : INotification {
         public EstimationModel Estimation { get; }
 
-        public EstimationGivenNotification(EstimationModel estimation) {
+        public string SessionId { get; }
+
+        public EstimationGivenNotification(string sessionId, EstimationModel estimation) {
+            this.SessionId = sessionId;
             this.Estimation = estimation;
         }
     }

diff --git a/...erTime.Application/Notifications/EstimationGiven/EstimationGivenNotificationDispatcher.cs b/...erTime.Application/Notifications/EstimationGiven/EstimationGivenNotificationDispatcher.cs
@@ -16,6 +16,6 @@ public EstimationGivenNotificationDispatcher(ILogger<NotificationDispatcher<Esti
         protected override Task DispatchCore(
             IEstimationGivenSubscriber subscriber,
             EstimationGivenNotification notification
-        ) => subscriber.OnEstimationGiven(notification.Estimation);
+        ) => subscriber.OnEstimationGiven(notification);
     }
 }
diff --git a/src/PokerTime.Application/Notifications/EstimationGiven/IEstimationGivenSubscriber.cs b/src/PokerTime.Application/Notifications/EstimationGiven/IEstimationGivenSubscriber.cs
@@ -7,9 +7,8 @@
 
 namespace PokerTime.Application.Notifications.EstimationGiven {
     using System.Threading.Tasks;
-    using Common.Models;
 
     public interface IEstimationGivenSubscriber : ISubscriber {
-        Task OnEstimationGiven(EstimationModel estimation);
+        Task OnEstimationGiven(EstimationGivenNotification notification);
     }
 }
diff --git a/src/PokerTime.Application/Poker/Commands/PlayCardCommandHandler.cs b/src/PokerTime.Application/Poker/Commands/PlayCardCommandHandler.cs
@@ -82,6 +82,7 @@ public async Task<Unit> Handle(PlayCardCommand request, CancellationToken cancel
             await dbContext.SaveChangesAsync(cancellationToken);
 
             var estimationNotification = new EstimationGivenNotification(
+                session.UrlId.StringId,
                 this._mapper.Map<EstimationModel>(estimation)
             );
 

diff --git a/src/PokerTime.Application/SessionWorkflows/Commands/AbstractStageCommandHandler.cs b/src/PokerTime.Application/SessionWorkflows/Commands/AbstractStageCommandHandler.cs
@@ -17,16 +17,16 @@ namespace PokerTime.Application.SessionWorkflows.Commands {
     using Services;
 
     public abstract class AbstractStageCommandHandler<TRequest> : IRequestHandler<TRequest> where TRequest : AbstractStageCommand, IRequest {
-        private readonly ISessionStatusUpdateDispatcher _retrospectiveStatusUpdateDispatcher;
+        private readonly ISessionStatusUpdateDispatcher _sessionStatusUpdateDispatcher;
         private readonly IPokerTimeDbContextFactory _dbContextFactory;
 
 #nullable disable
         protected IPokerTimeDbContext DbContext { get; private set; }
 #nullable enable
 
-        protected AbstractStageCommandHandler(IPokerTimeDbContextFactory pokerTimeDbContext, ISessionStatusUpdateDispatcher retrospectiveStatusUpdateDispatcher) {
+        protected AbstractStageCommandHandler(IPokerTimeDbContextFactory pokerTimeDbContext, ISessionStatusUpdateDispatcher sessionStatusUpdateDispatcher) {
             this._dbContextFactory = pokerTimeDbContext;
-            this._retrospectiveStatusUpdateDispatcher = retrospectiveStatusUpdateDispatcher;
+            this._sessionStatusUpdateDispatcher = sessionStatusUpdateDispatcher;
         }
 
         public async Task<Unit> Handle(TRequest request, CancellationToken cancellationToken) {
@@ -49,6 +49,6 @@ public async Task<Unit> Handle(TRequest request, CancellationToken cancellationT
 
         protected abstract Task<Unit> HandleCore(TRequest request, Session session, CancellationToken cancellationToken);
 
-        protected Task DispatchUpdate(Session session, CancellationToken cancellationToken) => this._retrospectiveStatusUpdateDispatcher.DispatchUpdate(session, cancellationToken);
+        protected Task DispatchUpdate(Session session, CancellationToken cancellationToken) => this._sessionStatusUpdateDispatcher.DispatchUpdate(session, cancellationToken);
     }
 }
diff --git a/src/PokerTime.Application/SessionWorkflows/Commands/InitiateDiscussionStageCommandHandler.cs b/src/PokerTime.Application/SessionWorkflows/Commands/InitiateDiscussionStageCommandHandler.cs
@@ -15,7 +15,7 @@ namespace PokerTime.Application.SessionWorkflows.Commands {
     using MediatR;
 
     public sealed class InitiateDiscussionStageCommandHandler : AbstractStageCommandHandler<InitiateDiscussionStageCommand> {
-        public InitiateDiscussionStageCommandHandler(IPokerTimeDbContext pokerTimeDbContext, ISessionStatusUpdateDispatcher retrospectiveStatusUpdateDispatcher) : base(pokerTimeDbContext, retrospectiveStatusUpdateDispatcher) {
+        public InitiateDiscussionStageCommandHandler(IPokerTimeDbContext pokerTimeDbContext, ISessionStatusUpdateDispatcher sessionStatusUpdateDispatcher) : base(pokerTimeDbContext, sessionStatusUpdateDispatcher) {
         }
 
         protected override async Task<Unit> HandleCore(InitiateDiscussionStageCommand request, Session session, CancellationToken cancellationToken) {

diff --git a/....Application/SessionWorkflows/Commands/InitiateEstimationDiscussionStageCommandHandler.cs b/....Application/SessionWorkflows/Commands/InitiateEstimationDiscussionStageCommandHandler.cs
@@ -15,7 +15,7 @@ namespace PokerTime.Application.SessionWorkflows.Commands {
     using MediatR;
 
     public sealed class InitiateEstimationDiscussionStageCommandHandler : AbstractStageCommandHandler<InitiateEstimationDiscussionStageCommand> {
-        public InitiateEstimationDiscussionStageCommandHandler(IPokerTimeDbContextFactory pokerTimeDbContext, ISessionStatusUpdateDispatcher retrospectiveStatusUpdateDispatcher) : base(pokerTimeDbContext, retrospectiveStatusUpdateDispatcher) {
+        public InitiateEstimationDiscussionStageCommandHandler(IPokerTimeDbContextFactory pokerTimeDbContext, ISessionStatusUpdateDispatcher sessionStatusUpdateDispatcher) : base(pokerTimeDbContext, sessionStatusUpdateDispatcher) {
         }
 
         protected override async Task<Unit> HandleCore(InitiateEstimationDiscussionStageCommand request, Session session, CancellationToken cancellationToken) {

diff --git a/src/PokerTime.Application/SessionWorkflows/Commands/InitiateEstimationStageCommandHandler.cs b/src/PokerTime.Application/SessionWorkflows/Commands/InitiateEstimationStageCommandHandler.cs
@@ -15,7 +15,7 @@ namespace PokerTime.Application.SessionWorkflows.Commands {
     using MediatR;
 
     public sealed class InitiateEstimationStageCommandHandler : AbstractStageCommandHandler<InitiateEstimationStageCommand> {
-        public InitiateEstimationStageCommandHandler(IPokerTimeDbContextFactory pokerTimeDbContext, ISessionStatusUpdateDispatcher retrospectiveStatusUpdateDispatcher) : base(pokerTimeDbContext, retrospectiveStatusUpdateDispatcher) {
+        public InitiateEstimationStageCommandHandler(IPokerTimeDbContextFactory pokerTimeDbContext, ISessionStatusUpdateDispatcher sessionStatusUpdateDispatcher) : base(pokerTimeDbContext, sessionStatusUpdateDispatcher) {
         }
 
         protected override async Task<Unit> HandleCore(InitiateEstimationStageCommand request, Session session, CancellationToken cancellationToken) {

diff --git a/src/PokerTime.Application/SessionWorkflows/Commands/InitiateFinishStageCommandHandler.cs b/src/PokerTime.Application/SessionWorkflows/Commands/InitiateFinishStageCommandHandler.cs
@@ -15,7 +15,7 @@ namespace PokerTime.Application.SessionWorkflows.Commands {
     using MediatR;
 
     public sealed class InitiateFinishStageCommandHandler : AbstractStageCommandHandler<InitiateFinishStageCommand> {
-        public InitiateFinishStageCommandHandler(IPokerTimeDbContextFactory pokerTimeDbContext, ISessionStatusUpdateDispatcher retrospectiveStatusUpdateDispatcher) : base(pokerTimeDbContext, retrospectiveStatusUpdateDispatcher) {
+        public InitiateFinishStageCommandHandler(IPokerTimeDbContextFactory pokerTimeDbContext, ISessionStatusUpdateDispatcher sessionStatusUpdateDispatcher) : base(pokerTimeDbContext, sessionStatusUpdateDispatcher) {
         }
 
         protected override async Task<Unit> HandleCore(InitiateFinishStageCommand request, Session session, CancellationToken cancellationToken) {

diff --git a/src/PokerTime.Web/Components/EstimationOverviewBase.cs b/src/PokerTime.Web/Components/EstimationOverviewBase.cs
@@ -39,7 +39,7 @@ public abstract class EstimationOverviewBase : MediatorComponent, IDisposable, I
 
         protected IEnumerable<string> ParticipantsWithoutEstimation {
             get {
-                if (this.ParticipantList == null || this.Estimations == null) {
+                if (this.ParticipantList == null) {
                     yield break;
                 }
 
@@ -56,9 +56,14 @@ protected IEnumerable<string> ParticipantsWithoutEstimation {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "<Pending>")]
         protected IDictionary<int, EstimationModel> Estimations { get; set; } = new Dictionary<int, EstimationModel>();
 
-        public Task OnEstimationGiven(EstimationModel estimation) {
+        public Task OnEstimationGiven(EstimationGivenNotification notification) {
+            if (notification == null) throw new ArgumentNullException(nameof(notification));
+            if (notification.SessionId != this.SessionStatus.SessionId) {
+                return Task.CompletedTask;
+            }
+
             this.InvokeAsync(() => {
-                this.Estimations[estimation.ParticipantId] = estimation;
+                this.Estimations[notification.Estimation.ParticipantId] = notification.Estimation;
 
                 this.StateHasChanged();
             });

diff --git a/src/PokerTime.Web/Pages/PokerSessionLobbyBase.cs b/src/PokerTime.Web/Pages/PokerSessionLobbyBase.cs
@@ -100,7 +100,7 @@ protected override async Task OnInitializedAsync() {
         }
 
         public Task OnSessionStatusUpdated(SessionStatus sessionStatus) {
-            if (this.SessionStatus?.SessionId != this.SessionId) {
+            if (sessionStatus.SessionId != this.SessionId) {
                 return Task.CompletedTask;
             }