Skip to content

Disallow Add-Type in NoLanguage mode on a locked down machine #16245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjmholt merged 1 commit into from
Oct 14, 2021
Merged

Disallow Add-Type in NoLanguage mode on a locked down machine #16245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Management.Automation.Security;
using System.Reflection;
using System.Runtime.Loader;
using System.Security;
Expand Down Expand Up @@ -549,8 +550,10 @@ private string GetUsingSet(Language language)
/// </summary>
protected override void BeginProcessing()
{
// Prevent code compilation in ConstrainedLanguage mode
if (SessionState.LanguageMode == PSLanguageMode.ConstrainedLanguage)
// Prevent code compilation in ConstrainedLanguage mode, or NoLanguage mode under system lock down.
if (SessionState.LanguageMode == PSLanguageMode.ConstrainedLanguage ||
(SessionState.LanguageMode == PSLanguageMode.NoLanguage &&
SystemPolicy.GetSystemLockdownPolicy() == SystemEnforcementMode.Enforce))
{
ThrowTerminatingError(
new ErrorRecord(
Expand Down
35 changes: 35 additions & 0 deletions ...powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,41 @@ try
}
}

Describe "Add-Type in no language mode on locked down system" -Tags 'Feature','RequireAdminOnWindows' {

It "Verifies Add-Type fails in no language mode when in system lock down" {

# Create No-Language session, that allows Add-Type cmdlet
$entry = [System.Management.Automation.Runspaces.SessionStateCmdletEntry]::new('Add-Type', [Microsoft.PowerShell.Commands.AddTypeCommand], $null)
$iss = [initialsessionstate]::CreateRestricted([System.Management.Automation.SessionCapabilities]::Language)
$iss.Commands.Add($entry)
$rs = [runspacefactory]::CreateRunspace($iss)
$rs.Open()

# Try to use Add-Type in No-Language session
$ps = [powershell]::Create($rs)
$ps.AddCommand('Add-Type').AddParameter('TypeDefinition', 'public class C1 { }')
$expectedError = $null
try
{
Invoke-LanguageModeTestingSupportCmdlet -SetLockdownMode
$ps.Invoke()
}
catch
{
$expectedError = $_
}
finally
{
Invoke-LanguageModeTestingSupportCmdlet -RevertLockdownMode -EnableFullLanguageMode
$rs.Dispose()
$ps.Dispose()
}

$expectedError.Exception.InnerException.ErrorRecord.FullyQualifiedErrorId | Should -BeExactly 'CannotDefineNewType,Microsoft.PowerShell.Commands.AddTypeCommand'
}
}

Describe "Import-LocalizedData additional commands in constrained language" -Tags 'Feature','RequireAdminOnWindows' {

It "Verifies Import-LocalizedData disallows Add-Type in constrained language" {
Expand Down