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

fixes for file uploads

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-27 01:13:49 +02:00
parent bff6a3dca5
commit 3a6c9259a0
4 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,16 +206,25 @@ namespace MareSynchronosServer.Hubs
return;
}
UploadFileRequest req = new();
req.FileData = ByteString.CopyFrom(await File.ReadAllBytesAsync(tempFileName).ConfigureAwait(false));
File.Delete(tempFileName);
req.Hash = computedHashString;
req.Uploader = AuthenticatedUserId;
Metadata headers = new Metadata()
{
{ "Authorization", Context.User!.Claims.SingleOrDefault(c => c.Type == ClaimTypes.Authentication)?.Value }
};
_ = await _fileServiceClient.UploadFileAsync(req, headers).ConfigureAwait(false);
var streamingCall = _fileServiceClient.UploadFile(headers);
using var tempFileStream = new FileStream(tempFileName, FileMode.Open, FileAccess.Read);
int size = 1024 * 1024;
byte[] data = new byte[size];
int readBytes;
while ((readBytes = tempFileStream.Read(data, 0, size)) > 0)
{
await streamingCall.RequestStream.WriteAsync(new UploadFileRequest()
{
FileData = ByteString.CopyFrom(data, 0, readBytes),
Hash = computedHashString,
Uploader = AuthenticatedUserId
}).ConfigureAwait(false);
}
await streamingCall.RequestStream.CompleteAsync();
}
catch (Exception ex)
{

2
MareSynchronosServer/MareSynchronosServices/CleanupService.cs
View File

@@ -85,7 +85,7 @@ namespace MareSynchronosServices
_logger.LogInformation("Cleaning up users older than {usersOlderThanDays} days", usersOlderThanDays);
var allUsers = dbContext.Users.ToList();
var allUsers = dbContext.Users.Where(u => string.IsNullOrEmpty(u.Alias)).ToList();
List<User> usersToRemove = new();
foreach (var user in allUsers)
{

2
MareSynchronosServer/MareSynchronosShared/Protos/mareservices.proto
View File

@@ -11,7 +11,7 @@ service AuthService {
}
service FileService {
rpc UploadFile (UploadFileRequest) returns (Empty);
rpc UploadFile (stream UploadFileRequest) returns (Empty);
rpc GetFileSizes (FileSizeRequest) returns (FileSizeResponse);
rpc DeleteFiles (DeleteFilesRequest) returns (Empty);
}

26
MareSynchronosServer/MareSynchronosStaticFilesServer/FileService.cs
View File

@@ -27,21 +27,33 @@ public class FileService : MareSynchronosShared.Protos.FileService.FileServiceBa
_metricsClient = metricsClient;
}
public override async Task<Empty> UploadFile(UploadFileRequest request, ServerCallContext context)
public override async Task<Empty> UploadFile(IAsyncStreamReader<UploadFileRequest> requestStream, ServerCallContext context)
{
var filePath = Path.Combine(_basePath, request.Hash);
var file = await _mareDbContext.Files.SingleOrDefaultAsync(f => f.Hash == request.Hash && f.UploaderUID == request.Uploader);
await requestStream.MoveNext();
var uploadMsg = requestStream.Current;
var filePath = Path.Combine(_basePath, uploadMsg.Hash);
using var fileWriter = File.OpenWrite(filePath);
var file = await _mareDbContext.Files.SingleOrDefaultAsync(f => f.Hash == uploadMsg.Hash && f.UploaderUID == uploadMsg.Uploader);
if (file != null)
{
var byteData = request.FileData.ToArray();
await File.WriteAllBytesAsync(filePath, byteData);
await fileWriter.WriteAsync(uploadMsg.FileData.ToArray());
while (await requestStream.MoveNext())
{
await fileWriter.WriteAsync(requestStream.Current.FileData.ToArray());
}
await fileWriter.FlushAsync();
fileWriter.Close();
var fileSize = new FileInfo(filePath).Length;
file.Uploaded = true;
_metricsClient.IncGauge(MetricsAPI.GaugeFilesTotal, 1);
_metricsClient.IncGauge(MetricsAPI.GaugeFilesTotalSize, byteData.Length);
_metricsClient.IncGauge(MetricsAPI.GaugeFilesTotalSize, fileSize);
await _mareDbContext.SaveChangesAsync().ConfigureAwait(false);
_logger.LogInformation("User {user} uploaded file {hash}", request.Uploader, request.Hash);
_logger.LogInformation("User {user} uploaded file {hash}", uploadMsg.Uploader, uploadMsg.Hash);
}
return new Empty();