nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 21:48:12 -05:00
Code

Fix send file length always zero (#1175)

Browse Source 
* HttpStream must be read prior to knowing it length

We also need to create the send prior to saving the stream so we
have well defined save location. Solve chicken-and-egg problem by saving
the Send twice. This also allows for validation that the stream received
is the same length as that promissed by the content-length header

* Get encrypted file length from request
This commit is contained in:
Matt Gibson 2021-03-02 09:27:11 -06:00 committed by GitHub
parent 8d5fc21b51
commit c2d34d7271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/SendsController.cs
View File

@ -160,7 +160,7 @@ namespace Bit.Api.Controllers
var userId = _userService.GetProperUserId(User).Value; var userId = _userService.GetProperUserId(User).Value;
var (madeSend, madeData) = model.ToSend(userId, fileName, _sendService); var (madeSend, madeData) = model.ToSend(userId, fileName, _sendService);
send = madeSend; send = madeSend;
await _sendService.CreateSendAsync(send, madeData, stream, Request.ContentLength.GetValueOrDefault(0)); await _sendService.CreateSendAsync(send, madeData, stream, model.FileLength.GetValueOrDefault(0));
}); });
return new SendResponseModel(send, _globalSettings); return new SendResponseModel(send, _globalSettings);

1
src/Core/Models/Api/Request/SendRequestModel.cs
View File

@ -13,6 +13,7 @@ namespace Bit.Core.Models.Api
public class SendRequestModel public class SendRequestModel
{ {
public SendType Type { get; set; } public SendType Type { get; set; }
public long? FileLength { get; set; }
[EncryptedString] [EncryptedString]
[EncryptedStringLength(1000)] [EncryptedStringLength(1000)]
public string Name { get; set; } public string Name { get; set; }

15
src/Core/Services/Implementations/SendService.cs
View File

@ -128,11 +128,24 @@ namespace Bit.Core.Services
try try
{ {
data.Id = fileId; data.Id = fileId;
data.Size = stream.Length;
send.Data = JsonConvert.SerializeObject(data, send.Data = JsonConvert.SerializeObject(data,
new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }); new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
await SaveSendAsync(send); await SaveSendAsync(send);
await _sendFileStorageService.UploadNewFileAsync(stream, send, fileId); await _sendFileStorageService.UploadNewFileAsync(stream, send, fileId);
// Need to save length of stream since that isn't available until it is read
if (stream.Length <= requestLength)
{
data.Size = stream.Length;
send.Data = JsonConvert.SerializeObject(data,
new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
await SaveSendAsync(send);
}
else
{
await DeleteSendAsync(send);
throw new BadRequestException("Content-Length header is smaller than file received.");
}
} }
catch catch
{ {