Fixed large file upload. Added .mkv support. Fixes impworks#170.

Katarn · Aug 11, 2020 · 48bc40c · 48bc40c
1 parent c933d50
commit 48bc40c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/src/Bonsai/Areas/Admin/Controllers/MediaController.cs b/src/Bonsai/Areas/Admin/Controllers/MediaController.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Bonsai.Areas.Admin.Logic;
 using Bonsai.Areas.Admin.Logic.Workers;
+using Bonsai.Areas.Admin.Utils;
 using Bonsai.Areas.Admin.ViewModels.Media;
 using Bonsai.Areas.Front.Logic;
 using Bonsai.Code.DomainModel.Media;
@@ -15,6 +16,8 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 
 namespace Bonsai.Areas.Admin.Controllers

diff --git a/src/Bonsai/Areas/Admin/Logic/MediaHandlers/VideoMediaHandler.cs b/src/Bonsai/Areas/Admin/Logic/MediaHandlers/VideoMediaHandler.cs
@@ -24,8 +24,10 @@ public VideoMediaHandler(IHostingEnvironment env)
         {
             "video/mp4",
             "video/x-flv",
+            "video/ogg",
             "video/quicktime",
             "video/x-msvideo",
+            "video/x-matroska"
         };
 
         /// <summary>

diff --git a/src/Bonsai/Code/Config/Startup.Services.cs b/src/Bonsai/Code/Config/Startup.Services.cs
@@ -1,4 +1,5 @@
-using Bonsai.Areas.Admin.Logic;
+using System;
+using Bonsai.Areas.Admin.Logic;
 using Bonsai.Areas.Admin.Logic.Changesets;
 using Bonsai.Areas.Admin.Logic.MediaHandlers;
 using Bonsai.Areas.Admin.Logic.Validation;
@@ -8,6 +9,7 @@
 using Bonsai.Areas.Front.Logic.Relations;
 using Bonsai.Code.Services;
 using Bonsai.Code.Services.Config;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Bonsai.Code.Config
@@ -19,6 +21,14 @@ public partial class Startup
         /// </summary>
         private void ConfigureAppServices(IServiceCollection services)
         {
+            services.Configure<FormOptions>(x =>
+            {
+                // actual value set in config via ConfigurableRequestSizeLimitFilter
+                x.MemoryBufferThreshold = int.MaxValue;
+                x.ValueLengthLimit = int.MaxValue;
+                x.MultipartBodyLengthLimit = int.MaxValue;
+            });
+
             services.AddNodeServices(x =>
             {
                 x.InvocationTimeoutMilliseconds = 1800000; // 30 min must be enough?

diff --git a/src/Bonsai/web.config b/src/Bonsai/web.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <system.webServer>
+        <security>
+            <requestFiltering>
+                <requestLimits maxAllowedContentLength="2147483647" />
+            </requestFiltering>
+        </security>
+    </system.webServer>
+</configuration>