Merge pull request #19 from PowerShell/dev

Release of version 1.3.0.0 of xSystemSecurity
dsccommunity · Dec 20, 2017 · f43f49c · f43f49c
2 parents 84b485c + c6abbd0
commit f43f49c
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 13 deletions.
diff --git a/DSCResources/MSFT_xFileSystemAccessRule/MSFT_xFileSystemAccessRule.psm1 b/DSCResources/MSFT_xFileSystemAccessRule/MSFT_xFileSystemAccessRule.psm1
@@ -123,7 +123,7 @@ function Set-TargetResource
         throw "Unable to get ACL for '$Path' as it does not exist"
     }
 
-    $acl = Get-Acl -Path $Path
+    $acl = Get-ACLAccess -Path $Path
     $accessRules = $acl.Access
 
     if ($Ensure -eq "Present")
@@ -230,5 +230,9 @@ function Test-TargetResource
 
     return $true
 }
+ Function Get-ACLAccess($Path)
+{
+    return (Get-Item -Path $Path).GetAccessControl('Access')
+}
 
 Export-ModuleMember -Function *-TargetResource
diff --git a/README.md b/README.md
@@ -97,6 +97,10 @@ Please refer to [this article](http://technet.microsoft.com/en-us/library/dd8832
 
 ### Unreleased
 
+### 1.3.0.0
+
+* Updated FileSystemACL Set
+
 ### 1.2.0.0
 * Converted appveyor.yml to install Pester from PSGallery instead of from Chocolatey.
 * Added xFileSystemAccessRule resource

diff --git a/Tests/Integration/MSFT_xFileSystemAccessRule.integration.tests.ps1 b/Tests/Integration/MSFT_xFileSystemAccessRule.integration.tests.ps1
@@ -25,13 +25,13 @@ try
 
         It 'New rule - Should compile without throwing' {
             {
-                Invoke-Expression -Command "$($script:DSCResourceName)_NewRule -OutputPath `$TestEnvironment.WorkingFolder"
+                Invoke-Expression -Command "$($script:DSCResourceName)_NewRule -OutputPath `$TestDrive"
             } | Should not throw
         }
 
         It "New rule - Should apply without throwing" {
             {
-                Start-DscConfiguration -Path $TestEnvironment.WorkingFolder `
+                Start-DscConfiguration -Path $TestDrive `
                     -ComputerName localhost -Wait -Verbose -Force
             } | Should not throw
         }
@@ -41,19 +41,19 @@ try
         }
 
         It 'New rule - Should have set the resource and all the parameters should match' {
-            Test-DscConfiguration -Path $TestEnvironment.WorkingFolder | Should Be $true
+            Test-DscConfiguration -Path $TestDrive | Should Be $true
         }
 
 
         It 'Update rule - Should compile without throwing' {
             {
-                Invoke-Expression -Command "$($script:DSCResourceName)_UpdateRule -OutputPath `$TestEnvironment.WorkingFolder"
+                Invoke-Expression -Command "$($script:DSCResourceName)_UpdateRule -OutputPath `$TestDrive"
             } | Should not throw
         }
 
         It "Update rule - Should apply without throwing" {
             {
-                Start-DscConfiguration -Path $TestEnvironment.WorkingFolder `
+                Start-DscConfiguration -Path $TestDrive `
                     -ComputerName localhost -Wait -Verbose -Force
             } | Should not throw
         }
@@ -64,18 +64,18 @@ try
         }
 
         It 'Remove rule - Should have set the resource and all the parameters should match' {
-            Test-DscConfiguration -Path $TestEnvironment.WorkingFolder | Should Be $true
+            Test-DscConfiguration -Path $TestDrive | Should Be $true
         }
 
         It 'Remove rule - Should compile without throwing' {
             {
-                Invoke-Expression -Command "$($script:DSCResourceName)_RemoveRule -OutputPath `$TestEnvironment.WorkingFolder"
+                Invoke-Expression -Command "$($script:DSCResourceName)_RemoveRule -OutputPath `$TestDrive"
             } | Should not throw
         }
 
         It "Remove rule - Should apply without throwing" {
             {
-                Start-DscConfiguration -Path $TestEnvironment.WorkingFolder `
+                Start-DscConfiguration -Path $TestDrive `
                     -ComputerName localhost -Wait -Verbose -Force
             } | Should not throw
         }
@@ -85,7 +85,7 @@ try
         }
 
         It 'New rule - Should have set the resource and all the parameters should match' {
-            Test-DscConfiguration -Path $TestEnvironment.WorkingFolder | Should Be $true
+            Test-DscConfiguration -Path $TestDrive | Should Be $true
         }
 
 

diff --git a/Tests/Unit/MSFT_xFileSystemAccessRule.tests.ps1 b/Tests/Unit/MSFT_xFileSystemAccessRule.tests.ps1
@@ -38,6 +38,13 @@ try
                       | Add-Member -MemberType ScriptMethod -Name "RemoveAccessRule" -Value {} -PassThru
                 }
 
+                Mock Get-ACLAccess { 
+                    return @{
+                        Access = @()
+                    } | Add-Member -MemberType ScriptMethod -Name "SetAccessRule" -Value {} -PassThru `
+                      | Add-Member -MemberType ScriptMethod -Name "RemoveAccessRule" -Value {} -PassThru
+                }
+
                 It "should return absent from the get method" {
                     (Get-TargetResource @testParams).Ensure | Should Be "Absent"
                 }
@@ -70,6 +77,18 @@ try
                       | Add-Member -MemberType ScriptMethod -Name "RemoveAccessRule" -Value {} -PassThru
                 }
 
+                 Mock Get-ACLAccess { 
+                    return @{
+                        Access = @(
+                            @{
+                                IdentityReference = $testParams.Identity
+                                FileSystemRights = [System.Security.AccessControl.FileSystemRights]::FullControl
+                            }
+                        )
+                    } | Add-Member -MemberType ScriptMethod -Name "SetAccessRule" -Value {} -PassThru `
+                      | Add-Member -MemberType ScriptMethod -Name "RemoveAccessRule" -Value {} -PassThru
+                }
+
                 It "should return present from the get method" {
                     (Get-TargetResource @testParams).Ensure | Should Be "Present"
                 }
@@ -129,6 +148,18 @@ try
                       | Add-Member -MemberType ScriptMethod -Name "RemoveAccessRule" -Value {} -PassThru
                 }
 
+                Mock Get-ACLAccess { 
+                    return @{
+                        Access = @(
+                            @{
+                                IdentityReference = $testParams.Identity
+                                FileSystemRights = [System.Security.AccessControl.FileSystemRights]::FullControl
+                            }
+                        )
+                    } | Add-Member -MemberType ScriptMethod -Name "SetAccessRule" -Value {} -PassThru `
+                      | Add-Member -MemberType ScriptMethod -Name "RemoveAccessRule" -Value {} -PassThru
+                }
+
                 It "should return present from the get method" {
                     (Get-TargetResource @testParams).Ensure | Should Be "Present"
                 }

diff --git a/xSystemSecurity.psd1 b/xSystemSecurity.psd1
@@ -7,7 +7,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '1.2.0.0'
+ModuleVersion = '1.3.0.0'
 
 # ID used to uniquely identify this module
 GUID = 'e30107af-a22a-48fb-b7bc-7d2b98489ac5'
@@ -36,6 +36,9 @@ VariablesToExport = '*'
 # Aliases to export from this module
 AliasesToExport = '*'
 
+# Minimum version of the Windows PowerShell engine required by this module
+PowerShellVersion = '4.0'
+
 # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
 PrivateData = @{
 
@@ -54,8 +57,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Converted appveyor.yml to install Pester from PSGallery instead of from Chocolatey.
-* Added xFileSystemAccessRule resource
+        ReleaseNotes = '* Updated FileSystemACL Set
 
 '
 
@@ -65,3 +67,4 @@ PrivateData = @{
 }
 
 
+