Add environment variables for Launcher path and args in ANCM

Author: BrennanConroy

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h

@@ -33,6 +33,8 @@
 #define CS_ASPNETCORE_DETAILEDERRORS                     L"ASPNETCORE_DETAILEDERRORS"
 #define CS_ASPNETCORE_ENVIRONMENT                        L"ASPNETCORE_ENVIRONMENT"
 #define CS_DOTNET_ENVIRONMENT                            L"DOTNET_ENVIRONMENT"
+#define CS_ANCM_LAUNCHER_PATH                            L"ANCM_LAUNCHER_PATH"
+#define CS_ANCM_LAUNCHER_ARGS                            L"ANCM_LAUNCHER_ARGS"
 
 class ConfigurationSection: NonCopyable
 {

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

@@ -4,6 +4,7 @@
 #include "InProcessOptions.h"
 #include "InvalidOperationException.h"
 #include "EventLog.h"
+#include "Environment.h"
 
 HRESULT InProcessOptions::Create(
     IHttpServer& pServer,
@@ -51,6 +52,11 @@ InProcessOptions::InProcessOptions(const ConfigurationSource &configurationSourc
     auto const aspNetCoreSection = configurationSource.GetRequiredSection(CS_ASPNETCORE_SECTION);
     m_strArguments = aspNetCoreSection->GetString(CS_ASPNETCORE_PROCESS_ARGUMENTS).value_or(CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT);
     m_strProcessPath = aspNetCoreSection->GetRequiredString(CS_ASPNETCORE_PROCESS_EXE_PATH);
+    // 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);
     m_fStdoutLogEnabled = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED);
     m_struStdoutLogFile = aspNetCoreSection->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE);
     m_fDisableStartUpErrorPage = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE);

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

@@ -7,6 +7,7 @@
 #include "environmentvariablehash.h"
 #include "exceptions.h"
 #include "config_utility.h"
+#include "Environment.h"
 
 REQUESTHANDLER_CONFIG::~REQUESTHANDLER_CONFIG()
 {
@@ -101,6 +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);
 
     pAdminManager = pHttpServer->GetAdminManager();
     try
@@ -248,12 +251,43 @@ REQUESTHANDLER_CONFIG::Populate(
         goto Finished;
     }
 
-    hr = GetElementStringProperty(pAspNetCoreElement,
-        CS_ASPNETCORE_PROCESS_EXE_PATH,
-        &m_struProcessPath);
-    if (FAILED(hr))
+    // We prefer the environment variables for LAUNCHER_PATH and LAUNCHER_ARGS
+    if (launcherPathEnv.has_value())
     {
-        goto Finished;
+        hr = m_struProcessPath.Copy(launcherPathEnv.value().c_str());
+        if (FAILED(hr))
+        {
+            goto Finished;
+        }
+    }
+    else
+    {
+        hr = GetElementStringProperty(pAspNetCoreElement,
+            CS_ASPNETCORE_PROCESS_EXE_PATH,
+            &m_struProcessPath);
+        if (FAILED(hr))
+        {
+            goto Finished;
+        }
+    }
+
+    if (launcherArgsEnv.has_value())
+    {
+        hr = m_struArguments.Copy(launcherArgsEnv.value().c_str());
+        if (FAILED(hr))
+        {
+            goto Finished;
+        }
+    }
+    else
+    {
+        hr = GetElementStringProperty(pAspNetCoreElement,
+            CS_ASPNETCORE_PROCESS_ARGUMENTS,
+            &m_struArguments);
+        if (FAILED(hr))
+        {
+            goto Finished;
+        }
     }
 
     hr = GetElementStringProperty(pAspNetCoreElement,
@@ -281,14 +315,6 @@ REQUESTHANDLER_CONFIG::Populate(
         goto Finished;
     }
 
-    hr = GetElementStringProperty(pAspNetCoreElement,
-        CS_ASPNETCORE_PROCESS_ARGUMENTS,
-        &m_struArguments);
-    if (FAILED(hr))
-    {
-        goto Finished;
-    }
-
     hr = GetElementDWORDProperty(pAspNetCoreElement,
         CS_ASPNETCORE_RAPID_FAILS_PER_MINUTE,
         &m_dwRapidFailsPerMinute);

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

@@ -880,6 +880,54 @@ public async Task StackOverflowCanBeSetBySettingLargerStackViaHandlerSetting()
             Assert.True(result.IsSuccessStatusCode);
         }
 
+        [ConditionalTheory]
+        [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
+        [RequiresNewShim]
+        [RequiresNewHandler]
+        [InlineData(HostingModel.InProcess)]
+        [InlineData(HostingModel.OutOfProcess)]
+        public async Task EnvironmentVariableForLauncherPathIsPreferred(HostingModel hostingModel)
+        {
+            var deploymentParameters = Fixture.GetBaseDeploymentParameters(hostingModel);
+
+            deploymentParameters.EnvironmentVariables["ANCM_LAUNCHER_PATH"] = "nope";
+            var result = await DeployAsync(deploymentParameters);
+            var response = await result.HttpClient.GetAsync("/");
+
+            if (hostingModel == HostingModel.InProcess)
+            {
+                Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            }
+            else
+            {
+                Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode);
+            }
+        }
+
+        [ConditionalTheory]
+        [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
+        [RequiresNewShim]
+        [RequiresNewHandler]
+        [InlineData(HostingModel.InProcess)]
+        [InlineData(HostingModel.OutOfProcess)]
+        public async Task EnvironmentVariableForLauncherArgsIsPreferred(HostingModel hostingModel)
+        {
+            var deploymentParameters = Fixture.GetBaseDeploymentParameters(hostingModel);
+
+            deploymentParameters.EnvironmentVariables["ANCM_LAUNCHER_ARGS"] = "fail";
+            var result = await DeployAsync(deploymentParameters);
+            var response = await result.HttpClient.GetAsync("/");
+
+            if (hostingModel == HostingModel.InProcess)
+            {
+                Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            }
+            else
+            {
+                Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode);
+            }
+        }
+
         private static void VerifyDotnetRuntimeEventLog(IISDeploymentResult deploymentResult)
         {
             var entries = GetEventLogsFromDotnetRuntime(deploymentResult);