Skip to content

Add ThreadJob module package and tests #7169

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 5 commits into from
Jul 6, 2018
Merged

Add ThreadJob module package and tests #7169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
514a749
Added ThreadJob module package and tests
PaulHigin Jun 25, 2018
f2c3cfc
Changes per CR comments
PaulHigin Jun 26, 2018
452f4fa
[Feature] Added CL support and tests
PaulHigin Jun 29, 2018
8eb19a7
[Feature] Fixed package path with correct version
PaulHigin Jul 2, 2018
1a2ad89
[Feature] Fixed test per CR
PaulHigin Jul 2, 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
12 changes: 12 additions & 0 deletions assets/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,6 +1825,16 @@
</Directory>
</Directory>
</Directory>
<Directory Id="dir37EBACBC570E49108415C3BA316EB66D" Name="ThreadJob">
<Directory Id="dirCB93DAC4CEB64A8583295B9AC4A79883" Name="1.1.1">
<Component Id="cmp9ADDEE83EFD3497C804FDC6B93A58031" Guid="{9ADDEE83EFD3497C804FDC6B93A58031}">
<File Id="fil15E1EF74BF8C4AFFA6E9B53D8CF6E15E" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\ThreadJob\1.1.1\ThreadJob.dll" />
</Component>
<Component Id="cmp57A7DBFA4541443CB3AB8A4B82DB53E0" Guid="{57A7DBFA4541443CB3AB8A4B82DB53E0}">
<File Id="fil57D698A50A2A40E58B0B954F55AEEA37" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\ThreadJob\1.1.1\ThreadJob.psd1" />
</Component>
</Directory>
</Directory>
<Directory Id="dirECE37E3EC3637A365744D075BD8132E9" Name="Microsoft.PowerShell.Management">
<Component Id="cmp6DAFD01CAA3A4C67185922F445EDE495" Guid="{D4374EC0-26FC-4607-AF6B-35721698E8A5}">
<File Id="fil92C4A6B2083E49B1909D17BC06E7526F" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\Microsoft.PowerShell.Management\Microsoft.PowerShell.Management.psd1" />
Expand Down Expand Up @@ -2195,6 +2205,8 @@
<ComponentRef Id="cmpEC5CF579D39FC75DC38E051E55A5CAD5" />
<ComponentRef Id="cmp0B896DBA6AFF2FD27FCD0E0968E23992" />
<ComponentRef Id="cmpC6A24F97E0D6739A51FE9CC80148F511" />
<ComponentRef Id="cmp9ADDEE83EFD3497C804FDC6B93A58031" />
<ComponentRef Id="cmp57A7DBFA4541443CB3AB8A4B82DB53E0" />
<ComponentRef Id="cmp5E6D0C75A767F360277D22D90E4689FF" />
<ComponentRef Id="cmp9544B34C5A30F75D0F45F5718A1795F0" />
<ComponentRef Id="cmpBDF0DC73F4F799A46B1DE220E58C1920" />
Expand Down
1 change: 1 addition & 0 deletions src/Modules/PSGalleryModules.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<PackageReference Include="PowerShellGet" Version="1.6.0" />
<PackageReference Include="Microsoft.PowerShell.Archive" Version="1.1.0.0" />
<PackageReference Include="PSReadLine" Version="2.0.0-beta2" />
<PackageReference Include="ThreadJob" Version="1.1.1" />
</ItemGroup>

</Project>
72 changes: 72 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 @@ -645,6 +645,78 @@ try
}
}

Describe "ThreadJob Constrained Language Tests" -Tags 'Feature','RequireAdminOnWindows' {

BeforeAll {

$sb = { $ExecutionContext.SessionState.LanguageMode }
}

It "ThreadJob script must run in ConstrainedLanguage mode with system lock down" {

try
{
$ExecutionContext.SessionState.LanguageMode = "ConstrainedLanguage"
Invoke-LanguageModeTestingSupportCmdlet -SetLockdownMode

$results = Start-ThreadJob -ScriptBlock { $ExecutionContext.SessionState.LanguageMode } | Wait-Job | Receive-Job
$results | Should BeExactly "ConstrainedLanguage"
}
finally
{
Invoke-LanguageModeTestingSupportCmdlet -RevertLockdownMode -EnableFullLanguageMode
}
}

It "ThreadJob script block using variable must run in ConstrainedLanguage mode with system lock down" {

try
{
$ExecutionContext.SessionState.LanguageMode = "ConstrainedLanguage"
Invoke-LanguageModeTestingSupportCmdlet -SetLockdownMode

$results = Start-ThreadJob -ScriptBlock { & $using:sb } | Wait-Job | Receive-Job
$results | Should BeExactly "ConstrainedLanguage"
}
finally
{
Invoke-LanguageModeTestingSupportCmdlet -RevertLockdownMode -EnableFullLanguageMode
}
}

It "ThreadJob script block argument variable must run in ConstrainedLanguage mode with system lock down" {

try
{
$ExecutionContext.SessionState.LanguageMode = "ConstrainedLanguage"
Invoke-LanguageModeTestingSupportCmdlet -SetLockdownMode

$results = Start-ThreadJob -ScriptBlock { param ($sb) & $sb } -ArgumentList $sb | Wait-Job | Receive-Job
$results | Should BeExactly "ConstrainedLanguage"
}
finally
{
Invoke-LanguageModeTestingSupportCmdlet -RevertLockdownMode -EnableFullLanguageMode
}
}

It "ThreadJob script block piped variable must run in ConstrainedLanguage mode with system lock down" {

try
{
$ExecutionContext.SessionState.LanguageMode = "ConstrainedLanguage"
Invoke-LanguageModeTestingSupportCmdlet -SetLockdownMode

$results = $sb | Start-ThreadJob -ScriptBlock { $input | foreach { & $_ } } | Wait-Job | Receive-Job
$results | Should BeExactly "ConstrainedLanguage"
}
finally
{
Invoke-LanguageModeTestingSupportCmdlet -RevertLockdownMode -EnableFullLanguageMode
}
}
}

# End Describe blocks
}
finally
Expand Down
Loading