Add error if invalid -ExecutionPolicy is passed to pwsh (#20460)

SteveL-MSFT · web-flow · commit a0e6807bb238 · 2023-10-16T15:14:11.000-07:00
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -1078,7 +1078,16 @@ private void ParseHelper(string[] args)
                 {
                     ParseExecutionPolicy(args, ref i, ref _executionPolicy, CommandLineParameterParserStrings.MissingExecutionPolicyParameter);
                     ParametersUsed |= ParameterBitmap.ExecutionPolicy;
-                    ParametersUsed |= GetExecutionPolicy(_executionPolicy);
+                    var executionPolicy = GetExecutionPolicy(_executionPolicy);
+                    if (executionPolicy == ParameterBitmap.EPIncorrect)
+                    {
+                        SetCommandLineError(
+                            string.Format(CultureInfo.CurrentCulture, CommandLineParameterParserStrings.InvalidExecutionPolicyArgument, _executionPolicy),
+                            showHelp: true);
+                        break;
+                    }
+
+                    ParametersUsed |= executionPolicy;
                 }
                 else if (MatchSwitch(switchKey, "encodedcommand", "e") || MatchSwitch(switchKey, "ec", "e"))
                 {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
@@ -222,4 +222,7 @@ Valid formats are:
   <data name="NullElementInArgs" xml:space="preserve">
     <value>The specified arguments must not contain null elements.</value>
   </data>
+  <data name="InvalidExecutionPolicyArgument" xml:space="preserve">
+    <value>Invalid ExecutionPolicy value '{0}'.</value>
+  </data>
 </root>
diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -943,6 +943,12 @@ $powershell -c '[System.Management.Automation.Platform]::SelectProductNameForDir
             $out | Should -Be $expected
         }
     }
+
+    It 'Errors for invalid ExecutionPolicy string' {
+        $out = pwsh -nologo -noprofile -executionpolicy NonExistingExecutionPolicy -c 'exit 0' 2>&1
+        $out | Should -Not -BeNullOrEmpty
+        $LASTEXITCODE | Should -Be $ExitCodeBadCommandLineParameter
+    }
 }
 
 Describe "WindowStyle argument" -Tag Feature {
diff --git a/test/xUnit/csharp/test_CommandLineParser.cs b/test/xUnit/csharp/test_CommandLineParser.cs
@@ -856,22 +856,24 @@ public static void TestParameter_ExecutionPolicy_No_Value(params string[] comman
         }
 
         [Theory]
-        [InlineData("-executionpolicy", "XML")]
-        [InlineData("-ex", "XML")]
-        [InlineData("-ep", "XML")]
-        public static void TestParameter_ExecutionPolicy_With_Right_Value(params string[] commandLine)
+        [InlineData("-executionpolicy", "InvalidPolicy")]
+        [InlineData("-ex", "InvalidPolicy")]
+        [InlineData("-ep", "InvalidPolicy")]
+        public static void TestParameter_ExecutionPolicy_With_Wrong_Value(params string[] commandLine)
         {
             var cpp = new CommandLineParameterParser();
 
             cpp.Parse(commandLine);
 
-            Assert.False(cpp.AbortStartup);
+            Assert.True(cpp.AbortStartup);
             Assert.True(cpp.NoExit);
-            Assert.False(cpp.ShowShortHelp);
-            Assert.True(cpp.ShowBanner);
-            Assert.Equal((uint)ConsoleHost.ExitCodeSuccess, cpp.ExitCode);
+            Assert.True(cpp.ShowShortHelp);
+            Assert.False(cpp.ShowBanner);
+            Assert.Equal((uint)ConsoleHost.ExitCodeBadCommandLineParameter, cpp.ExitCode);
             Assert.Equal(commandLine[1], cpp.ExecutionPolicy);
-            Assert.Null(cpp.ErrorMessage);
+            Assert.Equal(
+                string.Format(CommandLineParameterParserStrings.InvalidExecutionPolicyArgument, "InvalidPolicy"),
+                cpp.ErrorMessage);
         }
 
         [Theory]

Original file line number	Diff line number	Diff line change
`@@ -1078,7 +1078,16 @@ private void ParseHelper(string[] args)`
`1078`	`1078`	`{`
`1079`	`1079`	`ParseExecutionPolicy(args, ref i, ref _executionPolicy, CommandLineParameterParserStrings.MissingExecutionPolicyParameter);`
`1080`	`1080`	`ParametersUsed \|= ParameterBitmap.ExecutionPolicy;`
`1081`		`- ParametersUsed \|= GetExecutionPolicy(_executionPolicy);`
	`1081`	`+ var executionPolicy = GetExecutionPolicy(_executionPolicy);`
	`1082`	`+ if (executionPolicy == ParameterBitmap.EPIncorrect)`
	`1083`	`+ {`
	`1084`	`+ SetCommandLineError(`
	`1085`	`+ string.Format(CultureInfo.CurrentCulture, CommandLineParameterParserStrings.InvalidExecutionPolicyArgument, _executionPolicy),`
	`1086`	`+ showHelp: true);`
	`1087`	`+ break;`
	`1088`	`+ }`
	`1089`	`+`
	`1090`	`+ ParametersUsed \|= executionPolicy;`
`1082`	`1091`	`}`
`1083`	`1092`	`else if (MatchSwitch(switchKey, "encodedcommand", "e") \|\| MatchSwitch(switchKey, "ec", "e"))`
`1084`	`1093`	`{`
Original file line number	Diff line number	Diff line change
`@@ -943,6 +943,12 @@ $powershell -c '[System.Management.Automation.Platform]::SelectProductNameForDir`
`943`	`943`	`$out \| Should -Be $expected`
`944`	`944`	`}`
`945`	`945`	`}`
	`946`	`+`
	`947`	`+ It 'Errors for invalid ExecutionPolicy string' {`
	`948`	`+ $out = pwsh -nologo -noprofile -executionpolicy NonExistingExecutionPolicy -c 'exit 0' 2>&1`
	`949`	`+ $out \| Should -Not -BeNullOrEmpty`
	`950`	`+ $LASTEXITCODE \| Should -Be $ExitCodeBadCommandLineParameter`
	`951`	`+ }`
`946`	`952`	`}`
`947`	`953`
`948`	`954`	`Describe "WindowStyle argument" -Tag Feature {`