From 1779d33a66993a88e5334ee354d97419a9f80515 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Tue, 17 Aug 2021 09:37:00 -0400 Subject: [PATCH] Verify Send file does not exist before saving file (#1515) * Verify Send file does not exist before saving file * Fix flaky test --- src/Core/Services/Implementations/SendService.cs | 5 +++++ test/Core.Test/Services/OrganizationServiceTests.cs | 1 + 2 files changed, 6 insertions(+) diff --git a/src/Core/Services/Implementations/SendService.cs b/src/Core/Services/Implementations/SendService.cs index 17446863a2..918d816170 100644 --- a/src/Core/Services/Implementations/SendService.cs +++ b/src/Core/Services/Implementations/SendService.cs @@ -130,6 +130,11 @@ namespace Bit.Core.Services var data = JsonConvert.DeserializeObject(send.Data); + if (data.Validated) + { + throw new BadRequestException("File has already been uploaded."); + } + await _sendFileStorageService.UploadNewFileAsync(stream, send, data.Id); if (!await ValidateSendFile(send)) diff --git a/test/Core.Test/Services/OrganizationServiceTests.cs b/test/Core.Test/Services/OrganizationServiceTests.cs index 385ff6b09f..ecfd225a16 100644 --- a/test/Core.Test/Services/OrganizationServiceTests.cs +++ b/test/Core.Test/Services/OrganizationServiceTests.cs @@ -79,6 +79,7 @@ namespace Bit.Core.Test.Services List newUsers) { org.UseDirectory = true; + org.Seats = newUsers.Count + existingUsers.Count + 1; var reInvitedUser = existingUsers.First(); reInvitedUser.ExternalId = null; newUsers.Add(new ImportedOrganizationUser