Skip to content

Fix Export-ModuleMember bug for scriptblocks having no context #8363

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
TravisEz13 merged 3 commits into from
Nov 30, 2018
Merged

Fix Export-ModuleMember bug for scriptblocks having no context #8363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83e0ec3
Add fix for unexpected error when exporting scriptblock function
PaulHigin Nov 29, 2018
5e7a072
Made test Windows only
PaulHigin Nov 29, 2018
7db293c
[Feature]
PaulHigin Nov 29, 2018
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
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/Modules/ExportModuleMemberCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protected override void ProcessRecord()

// Prevent script injection attack by disallowing ExportModuleMemberCommand to export module members across
// language boundaries. This will prevent injected untrusted script from exporting private trusted module functions.
if (Context.EngineSessionState.Module != null &&
if (Context.EngineSessionState.Module?.LanguageMode != null &&
Context.LanguageMode != Context.EngineSessionState.Module.LanguageMode)
{
var se = new PSSecurityException(Modules.CannotExportMembersAccrossLanguageBoundaries);
Expand Down
48 changes: 48 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageModules.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,6 +1401,54 @@ try
$module.ExportedCommands.Values[0].Name | Should -BeExactly 'PublicFn'
}
}

Describe "Export-ModuleMember should succeed in FullLanguage mode with scriptblock created without context" -Tag 'Feature' {

BeforeAll {

$typeDef = @'
using System;
using System.Management.Automation;
using System.Management.Automation.Runspaces;

public class TestScriptBlockCreate
{
private ScriptBlock _scriptBlock;

public ScriptBlock CreateScriptBlock()
{
var thread = new System.Threading.Thread(ThreadProc);
thread.Start(null);
thread.Join();

return _scriptBlock;
}

private void ThreadProc(object state)
{
// Create script block on thread with no PowerShell context
_scriptBlock = ScriptBlock.Create(@"function Do-Nothing {}; Export-ModuleMember -Function Do-Nothing");
}
}
'@

try
{
Add-Type -TypeDefinition $typeDef
}
catch { }
}

It "Verfies that Export-ModuleMember does not throw error with context-less scriptblock" {

$scriptBlockCreator = [TestScriptBlockCreate]::new()
$testScriptBlock = $scriptBlockCreator.CreateScriptBlock()

$testScriptBlock | Should -Not -BeNullOrEmpty

{ New-Module -ScriptBlock $testScriptBlock -ErrorAction Stop } | Should -Not -Throw -Because "Scriptblock without execution context is allowed in Full Language"
}
}
}
finally
{
Expand Down