t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

write uploads to file instead of memory

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-12 12:47:06 +02:00
parent 50ff75c7ab
commit ea74dde4c3
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs
View File

@@ -158,18 +158,27 @@ namespace MareSynchronosServer.Hubs
if (relatedFile == null) return; if (relatedFile == null) return;
var forbiddenFile = _dbContext.ForbiddenUploadEntries.SingleOrDefault(f => f.Hash == hash); var forbiddenFile = _dbContext.ForbiddenUploadEntries.SingleOrDefault(f => f.Hash == hash);
if (forbiddenFile != null) return; if (forbiddenFile != null) return;
var uploadedFile = new List<byte>(); var finalFileName = Path.Combine(BasePath, hash);
var tempFileName = finalFileName + ".tmp";
using var fileStream = new FileStream(tempFileName, FileMode.OpenOrCreate);
long length = 0;
try try
{ {
await foreach (var chunk in fileContent) await foreach (var chunk in fileContent)
{ {
uploadedFile.AddRange(chunk); length += chunk.Length;
await fileStream.WriteAsync(chunk);
} }
await fileStream.FlushAsync();
await fileStream.DisposeAsync();
} }
catch catch
{ {
try try
{ {
await fileStream.FlushAsync();
await fileStream.DisposeAsync();
_dbContext.Files.Remove(relatedFile); _dbContext.Files.Remove(relatedFile);
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
} }
@@ -177,15 +186,19 @@ namespace MareSynchronosServer.Hubs
{ {
// already removed // already removed
} }
finally
{
File.Delete(tempFileName);
}
return; return;
} }
_logger.LogInformation("User " + AuthenticatedUserId + " upload finished: " + hash + ", size: " + uploadedFile.Count); _logger.LogInformation("User " + AuthenticatedUserId + " upload finished: " + hash + ", size: " + length);
try try
{ {
var decodedFile = LZ4.LZ4Codec.Unwrap(uploadedFile.ToArray()); var decodedFile = LZ4.LZ4Codec.Unwrap(await File.ReadAllBytesAsync(tempFileName));
using var sha1 = SHA1.Create(); using var sha1 = SHA1.Create();
using var ms = new MemoryStream(decodedFile); using var ms = new MemoryStream(decodedFile);
var computedHash = await sha1.ComputeHashAsync(ms); var computedHash = await sha1.ComputeHashAsync(ms);
@@ -199,12 +212,12 @@ namespace MareSynchronosServer.Hubs
return; return;
} }
await File.WriteAllBytesAsync(Path.Combine(BasePath, hash), uploadedFile.ToArray()); File.Move(tempFileName, finalFileName);
relatedFile = _dbContext.Files.Single(f => f.Hash == hash); relatedFile = _dbContext.Files.Single(f => f.Hash == hash);
relatedFile.Uploaded = true; relatedFile.Uploaded = true;
MareMetrics.FilesTotal.Inc(); MareMetrics.FilesTotal.Inc();
MareMetrics.FilesTotalSize.Inc(uploadedFile.Count); MareMetrics.FilesTotalSize.Inc(length);
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
_logger.LogInformation("File " + hash + " added to DB"); _logger.LogInformation("File " + hash + " added to DB");
@@ -215,7 +228,6 @@ namespace MareSynchronosServer.Hubs
_dbContext.Remove(relatedFile); _dbContext.Remove(relatedFile);
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
} }
} }
} }
} }