Skip to content
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

Jump to bottom

Avoid unnecessary path resolution for Get-Acl -LiteralPath #13107

Merged
merged 3 commits into from Jul 31, 2020
Merged

Avoid unnecessary path resolution for Get-Acl -LiteralPath #13107

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
4976341
Fix #11566 bug
Shriram0908 Jul 5, 2020
3a6df14
Replace -pending parameter with -skip
Shriram0908 Jul 9, 2020
3aea46f
Fix test failing in Linux and MacOS
Shriram0908 Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Security/security/AclCommands.cs
View file
Open in desktop
Expand Up @@ -825,7 +825,7 @@ protected override void ProcessRecord()
{
if (_isLiteralPath)
{
pathsToProcess.Add(SessionState.Path.GetUnresolvedProviderPathFromPSPath(p));
pathsToProcess.Add(p);
}
else
{
Expand Down
94 changes: 79 additions & 15 deletions test/powershell/Modules/Microsoft.PowerShell.Security/AclCmdlets.Tests.ps1
View file
Open in desktop
@@ -1,20 +1,84 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
Describe "Acl cmdlets are available and operate properly" -Tag CI {
It "Get-Acl returns an ACL object" -Pending:(!$IsWindows) {
$ACL = Get-Acl $TESTDRIVE
$ACL | Should -BeOfType System.Security.AccessControl.DirectorySecurity
}
It "Set-Acl can set the ACL of a directory" -Pending {
Setup -d testdir
$directory = "$TESTDRIVE/testdir"
$acl = Get-Acl $directory
$accessRule = [System.Security.AccessControl.FileSystemAccessRule]::New("Everyone","FullControl","ContainerInherit,ObjectInherit","None","Allow")
$acl.AddAccessRule($accessRule)
{ $acl | Set-Acl $directory } | Should -Not -Throw

$newacl = Get-Acl $directory
$newrule = $newacl.Access | Where-Object { $accessrule.FileSystemRights -eq $_.FileSystemRights -and $accessrule.AccessControlType -eq $_.AccessControlType -and $accessrule.IdentityReference -eq $_.IdentityReference }
$newrule | Should -Not -BeNullOrEmpty
Context "Windows ACL test" {
BeforeAll {
$PSDefaultParameterValues["It:Skip"] = -not $IsWindows
}

It "Get-Acl returns an ACL DirectorySecurity object" {
$ACL = Get-Acl $TESTDRIVE
$ACL | Should -BeOfType System.Security.AccessControl.DirectorySecurity
}

It "Get-Acl -LiteralPath HKLM:Software\Classes\*" {
$ACL = Get-Acl -LiteralPath HKLM:Software\Classes\*
$ACL | Should -BeOfType System.Security.AccessControl.RegistrySecurity
}

It "Get-Acl -LiteralPath .\Software\Classes\*" {
$currentPath = Get-Location
Set-Location -LiteralPath HKLM:\
$ACL = Get-Acl -LiteralPath .\Software\Classes\*
$ACL | Should -BeOfType System.Security.AccessControl.RegistrySecurity
$currentPath | Set-Location
}

It "Get-Acl -LiteralPath ." {
$currentPath = Get-Location
Set-Location -LiteralPath $TESTDRIVE
$ACL = Get-Acl -LiteralPath .
$ACL | Should -BeOfType System.Security.AccessControl.DirectorySecurity
$currentPath | Set-Location
}

It "Get-Acl -LiteralPath .." {
$currentPath = Get-Location
Set-Location -LiteralPath $TESTDRIVE
$ACL = Get-Acl -LiteralPath ..
$ACL | Should -BeOfType System.Security.AccessControl.DirectorySecurity
$currentPath | Set-Location
}

It "Get-Acl -Path .\Software\Classes\" {
$currentPath = Get-Location
Set-Location -LiteralPath HKLM:\
$ACL = Get-Acl -Path .\Software\Classes\
$ACL | Should -BeOfType System.Security.AccessControl.RegistrySecurity
$currentPath | Set-Location
}

It "Get-Acl -Path ." {
$currentPath = Get-Location
Set-Location -LiteralPath $TESTDRIVE
$ACL = Get-Acl -Path .
$ACL | Should -BeOfType System.Security.AccessControl.DirectorySecurity
$currentPath | Set-Location
}

It "Get-Acl -Path .." {
$currentPath = Get-Location
Set-Location -LiteralPath $TESTDRIVE
$ACL = Get-Acl -Path ..
$ACL | Should -BeOfType System.Security.AccessControl.DirectorySecurity
$currentPath | Set-Location
}

It "Set-Acl can set the ACL of a directory" {
Setup -d testdir
$directory = "$TESTDRIVE/testdir"
$acl = Get-Acl $directory
$accessRule = [System.Security.AccessControl.FileSystemAccessRule]::New("Everyone","FullControl","ContainerInherit,ObjectInherit","None","Allow")
$acl.AddAccessRule($accessRule)
{ $acl | Set-Acl $directory } | Should -Not -Throw

$newacl = Get-Acl $directory
$newrule = $newacl.Access | Where-Object { $accessrule.FileSystemRights -eq $_.FileSystemRights -and $accessrule.AccessControlType -eq $_.AccessControlType -and $accessrule.IdentityReference -eq $_.IdentityReference }
$newrule | Should -Not -BeNullOrEmpty
}

AfterAll {
$PSDefaultParameterValues.Remove("It:Skip")
}
}
}