cleanup

Author: jkotalik

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp

@@ -252,7 +252,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication()
         }
 
         // Used to make .NET Runtime always log to event log when there is an unhandled exception.
-        LOG_LAST_ERROR_IF(SetEnvironmentVariable(L"COMPlus_UseEntryPointFilter", L"1"));
+        LOG_LAST_ERROR_IF(!SetEnvironmentVariable(L"COMPlus_UseEntryPointFilter", L"1"));
 
         bool clrThreadExited;
         {

src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs

@@ -16,6 +16,7 @@
 using Microsoft.AspNetCore.Http.Features.Authentication;
 using Microsoft.AspNetCore.Server.IIS.Core.IO;
 using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Server.IIS.Core
 {
@@ -342,10 +343,12 @@ unsafe X509Certificate2 ITlsConnectionFeature.ClientCertificate
                 {
                     throw new ArgumentOutOfRangeException(nameof(value), CoreStrings.NonNegativeNumberOrNullRequired);
                 }
+
                 if (value > _options.IisMaxRequestSizeLimit)
                 {
-                    _logger.LogWarning("Cannot increase request size past IIS limit.");
+                    _logger.LogWarning(CoreStrings.MaxRequestLimitWarning);
                 }
+
                 MaxRequestBodySize = value;
             }
         }

src/Servers/IIS/IIS/src/Core/IISHttpServer.cs

@@ -81,6 +81,11 @@ ILogger<IISHttpServer> logger
             }
 
             Features.Set<IServerAddressesFeature>(_serverAddressesFeature);
+
+            if (_options.MaxRequestBodySize > _options.IisMaxRequestSizeLimit)
+            {
+                _logger.LogWarning(CoreStrings.MaxRequestLimitWarning);
+            }
         }
 
         public Task StartAsync<TContext>(IHttpApplication<TContext> application, CancellationToken cancellationToken)

src/Servers/IIS/IIS/src/CoreStrings.resx

@@ -162,4 +162,7 @@
   <data name="BadRequest" xml:space="preserve">
     <value>Bad request.</value>
   </data>
+  <data name="MaxRequestLimitWarning" xml:space="preserve">
+    <value>Increasing the MaxRequestBodySize conflicts with the max value for IIS limit maxAllowedContentLength. HTTP requests that have a content length greater than maxAllowedContentLength will still be rejected by IIS. You can disable the limit by either removing or setting the maxAllowedContentLength value to a higher limit.</value>
+  </data>
 </root>

src/Servers/IIS/IIS/src/Properties/CoreStrings.Designer.cs

@@ -46,11 +46,6 @@ public static IWebHostBuilder UseIIS(this IWebHostBuilder hostBuilder)
                             options => {
                                 options.ServerAddresses = iisConfigData.pwzBindings.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
                                 options.ForwardWindowsAuthentication = iisConfigData.fWindowsAuthEnabled || iisConfigData.fBasicAuthEnabled;
-                                if (options.MaxRequestBodySize > iisConfigData.maxRequestBodySize)
-                                {
-                                    // Log warning and set the max to the IIS limit
-                                    options.MaxRequestBodySize = iisConfigData.maxRequestBodySize;
-                                }
                                 options.IisMaxRequestSizeLimit = iisConfigData.maxRequestBodySize;
                             }
                         );

src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs

@@ -4,7 +4,9 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Server.IIS;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
@@ -47,8 +49,33 @@ public async Task SetIISLimitMaxRequestBodySizeE2EWorks()
             var deploymentResult = await DeployAsync(deploymentParameters);
 
             var result = await deploymentResult.HttpClient.PostAsync("/ReadRequestBody", new StringContent("test"));
+
             // IIS returns a 404 instead of a 413... 
             Assert.Equal(HttpStatusCode.NotFound, result.StatusCode);
         }
+
+        [ConditionalFact]
+        [RequiresNewHandler]
+        [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
+        public async Task SetIISLimitMaxRequestBodyLogsWarning()
+        {
+            var deploymentParameters = Fixture.GetBaseDeploymentParameters();
+            deploymentParameters.ServerConfigActionList.Add(
+                (config, _) => {
+                    config
+                        .RequiredElement("system.webServer")
+                        .GetOrAdd("security")
+                        .GetOrAdd("requestFiltering")
+                        .GetOrAdd("requestLimits", "maxAllowedContentLength", "1");
+                });
+            var deploymentResult = await DeployAsync(deploymentParameters);
+
+            var result = await deploymentResult.HttpClient.PostAsync("/DecreaseRequestLimit", new StringContent("1"));
+            Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+
+            Assert.Single(TestSink.Writes, w => w.Message == "Increasing the MaxRequestBodySize conflicts with the max value for IIS limit maxAllowedContentLength." +
+                " HTTP requests that have a content length greater than maxAllowedContentLength will still be rejected by IIS." +
+                " You can disable the limit by either removing or setting the maxAllowedContentLength value to a higher limit.");
+        }
     }
 }

src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs

@@ -112,7 +112,7 @@ public static int Main(string[] args)
                             .UseIIS()
                             .ConfigureServices(services =>
                             {
-                                services.Configure<IISServerOptions>(options => options.MaxRequestBodySize = 1);
+                                services.Configure<IISServerOptions>(options => options.MaxRequestBodySize = 2);
                             })
                             .UseStartup<Startup>()
                             .Build();