Fix error System.IO.InvalidDataException: Multipart body length limit (#617)

* Fix error System.IO.InvalidDataException: Multipart body length limit 134217728 exceeded making that limit configurable and with a default of 500MB instead of 128MB

* Adjust DEFAULT_MAX_FILE_UPLOAD_SIZE_BYTES to 528MB

* Settings read at Startup were not using the standard mechanism of Config which considers the environment variables overriding values defined at appsettings.json as reviewed by @ggallotti

(cherry picked from commit 4535465)

Author: claudiamurialdo

dotnet/src/dotnetcore/GxClasses.Web/Middleware/HandlerFactory.cs

@@ -20,6 +20,7 @@ public class AppSettings
 		public BaseUrls BaseUrls { get; set; }
 		public bool AnalyticsEnabled { get; set; }
 		public int SessionTimeout { get; set; }
+		public int MaxFileUploadSize { get; set; }
 	}
 
 	public class BaseUrls
@@ -32,7 +33,6 @@ public class BaseUrls
 	public class HandlerFactory
 	{
 		private static readonly ILog log = log4net.LogManager.GetLogger(typeof(GeneXus.HttpHandlerFactory.HandlerFactory));
-		private readonly AppSettings _appSettings;
 		private string _basePath;
 		static Dictionary<string, Type> _aspxObjects = new Dictionary<string, Type>(){
 												{"gxoauthlogout",typeof(GXOAuthLogout)},
@@ -59,14 +59,13 @@ public class HandlerFactory
 		private const string QUERYVIEWER_NAMESPACE = "QueryViewer.Services";
 		private const string GXFLOW_NSPACE = "GXflow.Programs";
 		private static List<string> GxNamespaces;
-		public HandlerFactory(RequestDelegate next, IOptions<AppSettings> appSettings)
+		public HandlerFactory(RequestDelegate next)
 		{
-			_appSettings = appSettings.Value; 
+		
 		}
-		public HandlerFactory(RequestDelegate next, IOptions<AppSettings> appSettings, String basePath)
+		public HandlerFactory(RequestDelegate next, String basePath)
 		{
 			_basePath = basePath;
-			_appSettings = appSettings.Value;
 		}
 
 

dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs

@@ -13,12 +13,12 @@
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Rewrite;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
@@ -90,6 +90,7 @@ public class Startup
 
 		static readonly ILog log = log4net.LogManager.GetLogger(typeof(Startup));
 		const int DEFAULT_SESSION_TIMEOUT_MINUTES = 20;
+		const int DEFAULT_MAX_FILE_UPLOAD_SIZE_BYTES = 528000000;
 		public static string VirtualPath = string.Empty;
 		public static string LocalPath = Directory.GetCurrentDirectory();
 
@@ -107,22 +108,14 @@ public class Startup
 
 		public Startup(Microsoft.AspNetCore.Hosting.IHostingEnvironment env)
 		{
-
-			var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
-			  	.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
-                .AddEnvironmentVariables();
 			GXRouting.ContentRootPath = env.ContentRootPath;
 			GXRouting.UrlTemplateControllerWithParms = "controllerWithParms";
-			Config.ConfigRoot = builder.Build();
 			GxContext.IsHttpContext = true;
 			gxRouting = new GXRouting(REST_BASE_URL);
 		}
 		public void ConfigureServices(IServiceCollection services)
 		{
 			services.AddMvc(option => option.EnableEndpointRouting = false);
-			services.Configure<AppSettings>(Config.ConfigRoot.GetSection("AppSettings"));
 			services.Configure<KestrelServerOptions>(options =>
 			{
 				options.AllowSynchronousIO = true;
@@ -133,17 +126,25 @@ public void ConfigureServices(IServiceCollection services)
 				options.AllowSynchronousIO = true;
 			});
 			services.AddDistributedMemoryCache();
-			AppSettings settings = new AppSettings();
-			Config.ConfigRoot.GetSection("AppSettings").Bind(settings);
 
+			services.Configure<FormOptions>(options =>
+			{
+				if (Config.GetValueOf("MaxFileUploadSize", out string MaxFileUploadSizeStr) && int.TryParse(MaxFileUploadSizeStr, out int MaxFileUploadSize))
+					options.MultipartBodyLengthLimit = MaxFileUploadSize;
+				else
+					options.MultipartBodyLengthLimit = DEFAULT_MAX_FILE_UPLOAD_SIZE_BYTES;
+			});
 			ISessionService sessionService = GXSessionServiceFactory.GetProvider();
 
 			if (sessionService != null)
 				ConfigureSessionService(services, sessionService);
 			services.AddHttpContextAccessor();
 			services.AddSession(options =>
 			{
-				options.IdleTimeout = TimeSpan.FromMinutes(settings.SessionTimeout==0 ? DEFAULT_SESSION_TIMEOUT_MINUTES : settings.SessionTimeout); 
+				if (Config.GetValueOf("SessionTimeout", out string SessionTimeoutStr) && int.TryParse(SessionTimeoutStr, out int SessionTimeout))
+					options.IdleTimeout = TimeSpan.FromMinutes(SessionTimeout);
+				else
+					options.IdleTimeout = TimeSpan.FromMinutes(DEFAULT_SESSION_TIMEOUT_MINUTES); 
 				options.Cookie.HttpOnly = true;
 				options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
 				options.Cookie.IsEssential = true;