test and fix

Author: BrennanConroy

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp

@@ -54,6 +54,11 @@ ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) :
         .value_or(environmentVariables[CS_ASPNETCORE_ENVIRONMENT]);
     const auto dotnetEnvironment = Environment::GetEnvironmentVariableValue(CS_DOTNET_ENVIRONMENT)
         .value_or(environmentVariables[CS_DOTNET_ENVIRONMENT]);
+    // We prefer the environment variables for LAUNCHER_PATH and LAUNCHER_ARGS
+    m_strProcessPath = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_PATH)
+        .value_or(m_strProcessPath);
+    m_strArguments = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_ARGS)
+        .value_or(m_strArguments);
 
     auto detailedErrorsEnabled = equals_ignore_case(L"1", detailedErrors) || equals_ignore_case(L"true", detailedErrors);
     auto aspnetCoreEnvironmentEnabled = equals_ignore_case(L"Development", aspnetCoreEnvironment);

src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp

@@ -102,8 +102,8 @@ REQUESTHANDLER_CONFIG::Populate(
     BSTR                            bstrBasicAuthSection = NULL;
     BSTR                            bstrAnonymousAuthSection = NULL;
     BSTR                            bstrAspNetCoreSection = NULL;
-    auto launcherPathEnv = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_PATH);
-    auto launcherArgsEnv = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_ARGS);
+    std::optional<std::wstring> launcherPathEnv;
+    std::optional<std::wstring> launcherArgsEnv;
 
     pAdminManager = pHttpServer->GetAdminManager();
     try
@@ -252,13 +252,20 @@ REQUESTHANDLER_CONFIG::Populate(
     }
 
     // We prefer the environment variables for LAUNCHER_PATH and LAUNCHER_ARGS
+    try
+    {
+        launcherPathEnv = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_PATH);
+        launcherArgsEnv = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_ARGS);
+    }
+    catch(...)
+    {
+        FINISHED_IF_FAILED(E_FAIL);
+    }
+
     if (launcherPathEnv.has_value())
     {
         hr = m_struProcessPath.Copy(launcherPathEnv.value().c_str());
-        if (FAILED(hr))
-        {
-            goto Finished;
-        }
+        FINISHED_IF_FAILED(hr);
     }
     else
     {
@@ -274,10 +281,7 @@ REQUESTHANDLER_CONFIG::Populate(
     if (launcherArgsEnv.has_value())
     {
         hr = m_struArguments.Copy(launcherArgsEnv.value().c_str());
-        if (FAILED(hr))
-        {
-            goto Finished;
-        }
+        FINISHED_IF_FAILED(hr);
     }
     else
     {

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

@@ -890,18 +890,10 @@ public async Task EnvironmentVariableForLauncherPathIsPreferred(HostingModel hos
         {
             var deploymentParameters = Fixture.GetBaseDeploymentParameters(hostingModel);
 
-            deploymentParameters.EnvironmentVariables["ANCM_LAUNCHER_PATH"] = "nope";
-            var result = await DeployAsync(deploymentParameters);
-            var response = await result.HttpClient.GetAsync("/");
+            deploymentParameters.EnvironmentVariables["ANCM_LAUNCHER_PATH"] = _dotnetLocation;
+            deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "nope"));
 
-            if (hostingModel == HostingModel.InProcess)
-            {
-                Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
-            }
-            else
-            {
-                Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode);
-            }
+            await StartAsync(deploymentParameters);
         }
 
         [ConditionalTheory]
@@ -913,19 +905,12 @@ public async Task EnvironmentVariableForLauncherPathIsPreferred(HostingModel hos
         public async Task EnvironmentVariableForLauncherArgsIsPreferred(HostingModel hostingModel)
         {
             var deploymentParameters = Fixture.GetBaseDeploymentParameters(hostingModel);
+            using var publishedApp = await deploymentParameters.ApplicationPublisher.Publish(deploymentParameters, LoggerFactory.CreateLogger("test"));
 
-            deploymentParameters.EnvironmentVariables["ANCM_LAUNCHER_ARGS"] = "fail";
-            var result = await DeployAsync(deploymentParameters);
-            var response = await result.HttpClient.GetAsync("/");
+            deploymentParameters.EnvironmentVariables["ANCM_LAUNCHER_ARGS"] = Path.ChangeExtension(Path.Combine(publishedApp.Path, deploymentParameters.ApplicationPublisher.ApplicationPath), ".dll");
+            deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("arguments", "nope"));
 
-            if (hostingModel == HostingModel.InProcess)
-            {
-                Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
-            }
-            else
-            {
-                Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode);
-            }
+            await StartAsync(deploymentParameters);
         }
 
         private static void VerifyDotnetRuntimeEventLog(IISDeploymentResult deploymentResult)