IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Files: ChunkedUploaderHandler

Browse Source
This commit is contained in:
pavelbannov 2020-04-20 11:08:04 +03:00
parent c5ff09ac09
commit eef99a3e96
5 changed files with 208 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/nginx/onlyoffice.conf
View File

@ -142,7 +142,7 @@ server {
try_files /$basename /index.html =404;
}
location ~* /httphandlers/filehandler.ashx {
location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) {
proxy_pass http://localhost:5007;
proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
}

13
products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
View File

@ -253,11 +253,11 @@ namespace ASC.Files.Helpers
{
var session = FileUploader.InitiateUpload(file.FolderID, (file.ID ?? default), file.Title, file.ContentLength, encrypted);
var response = ChunkedUploadSessionHelper.ToResponseObject(session, true);
var responseObject = ChunkedUploadSessionHelper.ToResponseObject(session, true);
return new
{
success = true,
data = response
data = responseObject
};
}
@ -279,11 +279,10 @@ namespace ASC.Files.Helpers
ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
}
using (var response = request.GetResponse())
using (var responseStream = response.GetResponseStream())
{
return JObject.Parse(new StreamReader(responseStream).ReadToEnd()); //result is json string
}
using var response = request.GetResponse();
using var responseStream = response.GetResponseStream();
using var streamReader = new StreamReader(responseStream);
return JObject.Parse(streamReader.ReadToEnd()); //result is json string
}
public FileWrapper<T> CreateTextFile(T folderId, string title, string content)

107
products/ASC.Files/Server/HttpHandlers/ChunkedUploaderHandler.cs
View File

@ -45,16 +45,37 @@ using ASC.Web.Files.Helpers;
using ASC.Web.Files.Utils;
using ASC.Web.Studio.Core;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
namespace ASC.Web.Files.HttpHandlers
{
public class ChunkedUploaderHandler //: AbstractHttpAsyncHandler
public class ChunkedUploaderHandler
{
public RequestDelegate Next { get; }
public IServiceProvider ServiceProvider { get; }
public ChunkedUploaderHandler(RequestDelegate next, IServiceProvider serviceProvider)
{
Next = next;
ServiceProvider = serviceProvider;
}
public async Task Invoke(HttpContext context)
{
using var scope = ServiceProvider.CreateScope();
var chunkedUploaderHandlerService = scope.ServiceProvider.GetService<ChunkedUploaderHandlerService>();
await chunkedUploaderHandlerService.Invoke(context);
await Next.Invoke(context);
}
}
public class ChunkedUploaderHandlerService
{
public TenantManager TenantManager { get; }
public FileUploader FileUploader { get; }
public FilesMessageService FilesMessageService { get; }
@ -67,8 +88,7 @@ namespace ASC.Web.Files.HttpHandlers
public ChunkedUploadSessionHelper ChunkedUploadSessionHelper { get; }
public ILog Logger { get; }
public ChunkedUploaderHandler(
RequestDelegate next,
public ChunkedUploaderHandlerService(
IOptionsMonitor<ILog> optionsMonitor,
TenantManager tenantManager,
FileUploader fileUploader,
@ -81,7 +101,6 @@ namespace ASC.Web.Files.HttpHandlers
ChunkedUploadSessionHolder chunkedUploadSessionHolder,
ChunkedUploadSessionHelper chunkedUploadSessionHelper)
{
Next = next;
TenantManager = tenantManager;
FileUploader = fileUploader;
FilesMessageService = filesMessageService;
@ -96,69 +115,80 @@ namespace ASC.Web.Files.HttpHandlers
}
public async Task Invoke(HttpContext context)
{
var uploadSession = ChunkedUploadSessionHolder.GetSession(context.Request.Query["uid"]);
if (uploadSession as ChunkedUploadSession<int> != null)
{
await Invoke<int>(context);
return;
}
await Invoke<string>(context);
}
public async Task Invoke<T>(HttpContext context)
{
try
{
var request = new ChunkedRequestHelper(context.Request);
var request = new ChunkedRequestHelper<T>(context.Request);
if (!TryAuthorize(request))
{
WriteError(context, "Can't authorize given initiate session request or session with specified upload id already expired");
await WriteError(context, "Can't authorize given initiate session request or session with specified upload id already expired");
return;
}
if (TenantManager.GetCurrentTenant().Status != TenantStatus.Active)
{
WriteError(context, "Can't perform upload for deleted or transfering portals");
await WriteError(context, "Can't perform upload for deleted or transfering portals");
return;
}
switch (request.Type(InstanceCrypto))
{
case ChunkedRequestType.Abort:
FileUploader.AbortUpload<string>(request.UploadId);
WriteSuccess(context, null);
FileUploader.AbortUpload<T>(request.UploadId);
await WriteSuccess(context, null);
return;
case ChunkedRequestType.Initiate:
var createdSession = FileUploader.InitiateUpload(request.FolderId, request.FileId, request.FileName, request.FileSize, request.Encrypted);
WriteSuccess(context, ChunkedUploadSessionHelper.ToResponseObject(createdSession, true));
await WriteSuccess(context, ChunkedUploadSessionHelper.ToResponseObject(createdSession, true));
return;
case ChunkedRequestType.Upload:
var resumedSession = FileUploader.UploadChunk<string>(request.UploadId, request.ChunkStream, request.ChunkSize);
var resumedSession = FileUploader.UploadChunk<T>(request.UploadId, request.ChunkStream, request.ChunkSize);
if (resumedSession.BytesUploaded == resumedSession.BytesTotal)
{
WriteSuccess(context, ToResponseObject(resumedSession.File), (int)HttpStatusCode.Created);
await WriteSuccess(context, ToResponseObject(resumedSession.File), (int)HttpStatusCode.Created);
FilesMessageService.Send(resumedSession.File, MessageAction.FileUploaded, resumedSession.File.Title);
}
else
{
WriteSuccess(context, ChunkedUploadSessionHelper.ToResponseObject(resumedSession));
await WriteSuccess(context, ChunkedUploadSessionHelper.ToResponseObject(resumedSession));
}
return;
default:
WriteError(context, "Unknown request type.");
await WriteError(context, "Unknown request type.");
return;
}
}
catch (FileNotFoundException error)
{
Logger.Error(error);
WriteError(context, FilesCommonResource.ErrorMassage_FileNotFound);
await WriteError(context, FilesCommonResource.ErrorMassage_FileNotFound);
}
catch (Exception error)
{
Logger.Error(error);
WriteError(context, error.Message);
await WriteError(context, error.Message);
}
}
await Next.Invoke(context);
}
private bool TryAuthorize(ChunkedRequestHelper request)
private bool TryAuthorize<T>(ChunkedRequestHelper<T> request)
{
if (request.Type(InstanceCrypto) == ChunkedRequestType.Initiate)
{
@ -172,7 +202,7 @@ namespace ASC.Web.Files.HttpHandlers
if (!string.IsNullOrEmpty(request.UploadId))
{
var uploadSession = ChunkedUploadSessionHolder.GetSession<string>(request.UploadId);
var uploadSession = ChunkedUploadSessionHolder.GetSession(request.UploadId);
if (uploadSession != null)
{
TenantManager.SetCurrentTenant(uploadSession.TenantId);
@ -187,21 +217,21 @@ namespace ASC.Web.Files.HttpHandlers
return false;
}
private static void WriteError(HttpContext context, string message)
private static async Task WriteError(HttpContext context, string message)
{
WriteResponse(context, false, null, message, (int)HttpStatusCode.OK);
await WriteResponse(context, false, null, message, (int)HttpStatusCode.OK);
}
private static void WriteSuccess(HttpContext context, object data, int statusCode = (int)HttpStatusCode.OK)
private static async Task WriteSuccess(HttpContext context, object data, int statusCode = (int)HttpStatusCode.OK)
{
WriteResponse(context, true, data, string.Empty, statusCode);
await WriteResponse(context, true, data, string.Empty, statusCode);
}
private static void WriteResponse(HttpContext context, bool success, object data, string message, int statusCode)
private static async Task WriteResponse(HttpContext context, bool success, object data, string message, int statusCode)
{
context.Response.StatusCode = statusCode;
context.Response.WriteAsync(JsonConvert.SerializeObject(new { success, data, message })).Wait();
context.Response.ContentType = "application/json";
await context.Response.WriteAsync(JsonConvert.SerializeObject(new { success, data, message }));
}
private static object ToResponseObject<T>(File<T> file)
@ -216,8 +246,9 @@ namespace ASC.Web.Files.HttpHandlers
uploaded = true
};
}
}
private enum ChunkedRequestType
public enum ChunkedRequestType
{
None,
Initiate,
@ -226,7 +257,7 @@ namespace ASC.Web.Files.HttpHandlers
}
[DebuggerDisplay("{Type} ({UploadId})")]
private class ChunkedRequestHelper
public class ChunkedRequestHelper<T>
{
private readonly HttpRequest _request;
private IFormFile _file;
@ -279,14 +310,14 @@ namespace ASC.Web.Files.HttpHandlers
return _authKey.Value;
}
public string FolderId
public T FolderId
{
get { return _request.Query[FilesLinkUtility.FolderId]; }
get { return (T)Convert.ChangeType(_request.Query[FilesLinkUtility.FolderId], typeof(T)); }
}
public string FileId
public T FileId
{
get { return _request.Query[FilesLinkUtility.FileId]; }
get { return (T)Convert.ChangeType(_request.Query[FilesLinkUtility.FileId], typeof(T)); }
}
public string FileName
@ -359,8 +390,7 @@ namespace ASC.Web.Files.HttpHandlers
private bool IsFileDataSet()
{
return !string.IsNullOrEmpty(FileName) && !string.IsNullOrEmpty(FolderId);
}
return !string.IsNullOrEmpty(FileName) && !FolderId.Equals(default(T));
}
}
@ -368,7 +398,7 @@ namespace ASC.Web.Files.HttpHandlers
{
public static DIHelper AddChunkedUploaderHandlerService(this DIHelper services)
{
services.TryAddScoped<ChunkedUploaderHandler>();
services.TryAddScoped<ChunkedUploaderHandlerService>();
return services
.AddTenantManagerService()
.AddFileUploaderService()
@ -381,5 +411,10 @@ namespace ASC.Web.Files.HttpHandlers
.AddChunkedUploadSessionHolderService()
.AddChunkedUploadSessionHelperService();
}
public static IApplicationBuilder UseChunkedUploaderHandler(this IApplicationBuilder builder)
{
return builder.UseMiddleware<ChunkedUploaderHandler>();
}
}
}

11
products/ASC.Files/Server/Startup.cs
View File

@ -9,6 +9,7 @@ using ASC.Common;
using ASC.Common.DependencyInjection;
using ASC.Common.Logging;
using ASC.Web.Files;
using ASC.Web.Files.HttpHandlers;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
@ -83,7 +84,8 @@ namespace ASC.Files
diHelper
.AddDocumentsControllerService()
.AddEncryptionControllerService()
.AddFileHandlerService();
.AddFileHandlerService()
.AddChunkedUploaderHandlerService();
services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
}
@ -129,6 +131,13 @@ namespace ASC.Files
appBranch.UseFileHandler();
});
app.MapWhen(
context => context.Request.Path.ToString().EndsWith("ChunkedUploader.ashx"),
appBranch =>
{
appBranch.UseChunkedUploaderHandler();
});
app.UseStaticFiles();
}
}

6
products/ASC.Files/Server/Utils/ChunkedUploadSessionHolder.cs
View File

@ -75,7 +75,11 @@ namespace ASC.Web.Files.Utils
public ChunkedUploadSession<T> GetSession<T>(string sessionId)
{
return (ChunkedUploadSession<T>)CommonSessionHolder(false).Get(sessionId);
return (ChunkedUploadSession<T>)GetSession(sessionId);
}
public CommonChunkedUploadSession GetSession(string sessionId)
{
return CommonSessionHolder(false).Get(sessionId);
}
public ChunkedUploadSession<T> CreateUploadSession<T>(File<T> file, long contentLength)