Separate DSC configuration parser check for ARM processor (PowerShell#21395)

dkontyko · web-flow · commit fe38405b1dc4 · 2024-04-22T16:03:42.000-07:00
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -2984,8 +2984,8 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom
                     Runspaces.Runspace.DefaultRunspace = localRunspace;
                 }
 
-                // Configuration is not supported on ARM or in ConstrainedLanguage
-                if (PsUtils.IsRunningOnProcessorArchitectureARM() || Runspace.DefaultRunspace?.ExecutionContext?.LanguageMode == PSLanguageMode.ConstrainedLanguage)
+                // Configuration is not supported in ConstrainedLanguage
+                if (Runspace.DefaultRunspace?.ExecutionContext?.LanguageMode == PSLanguageMode.ConstrainedLanguage)
                 {
                     if (SystemPolicy.GetSystemLockdownPolicy() != SystemEnforcementMode.Audit)
                     {
@@ -3004,6 +3004,17 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom
                         dropIntoDebugger: true);
                 }
 
+                // Configuration is not supported on ARM64
+                if (PsUtils.IsRunningOnProcessorArchitectureARM())
+                {
+                    ReportError(
+                        configurationToken.Extent,
+                        nameof(ParserStrings.ConfigurationNotAllowedOnArm64),
+                        ParserStrings.ConfigurationNotAllowedOnArm64,
+                        configurationToken.Kind.Text());
+                    return null;
+                }
+
                 // Configuration is not supported on WinPE
                 if (Utils.IsWinPEHost())
                 {
diff --git a/src/System.Management.Automation/resources/ParserStrings.resx b/src/System.Management.Automation/resources/ParserStrings.resx
@@ -1370,4 +1370,7 @@ ModuleVersion : Version of module to import. If used, ModuleName must represent
   <data name="WDACGetSteppablePipelineLogMessage" xml:space="preserve">
     <value>Creating a steppable pipeline from a script block may require evaluating some expressions within the script block. The expression evaluation will silently fail and return 'null' in Constrained Language mode, unless the expression represents a constant value.</value>
   </data>
+  <data name="ConfigurationNotAllowedOnArm64" xml:space="preserve">
+    <value>Configuration keyword is not supported on ARM64 processors.</value>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -2984,8 +2984,8 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom`
`2984`	`2984`	`Runspaces.Runspace.DefaultRunspace = localRunspace;`
`2985`	`2985`	`}`
`2986`	`2986`
`2987`		`- // Configuration is not supported on ARM or in ConstrainedLanguage`
`2988`		`- if (PsUtils.IsRunningOnProcessorArchitectureARM() \|\| Runspace.DefaultRunspace?.ExecutionContext?.LanguageMode == PSLanguageMode.ConstrainedLanguage)`
	`2987`	`+ // Configuration is not supported in ConstrainedLanguage`
	`2988`	`+ if (Runspace.DefaultRunspace?.ExecutionContext?.LanguageMode == PSLanguageMode.ConstrainedLanguage)`
`2989`	`2989`	`{`
`2990`	`2990`	`if (SystemPolicy.GetSystemLockdownPolicy() != SystemEnforcementMode.Audit)`
`2991`	`2991`	`{`
`@@ -3004,6 +3004,17 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom`
`3004`	`3004`	`dropIntoDebugger: true);`
`3005`	`3005`	`}`
`3006`	`3006`
	`3007`	`+ // Configuration is not supported on ARM64`
	`3008`	`+ if (PsUtils.IsRunningOnProcessorArchitectureARM())`
	`3009`	`+ {`
	`3010`	`+ ReportError(`
	`3011`	`+ configurationToken.Extent,`
	`3012`	`+ nameof(ParserStrings.ConfigurationNotAllowedOnArm64),`
	`3013`	`+ ParserStrings.ConfigurationNotAllowedOnArm64,`
	`3014`	`+ configurationToken.Kind.Text());`
	`3015`	`+ return null;`
	`3016`	`+ }`
	`3017`	`+`
`3007`	`3018`	`// Configuration is not supported on WinPE`
`3008`	`3019`	`if (Utils.IsWinPEHost())`
`3009`	`3020`	`{`