updated to not include system drives (#736)

microsoft · Sep 1, 2020 · 419e49c · 419e49c
1 parent 28aae8e
commit 419e49c
Show file tree

Hide file tree

Showing 18 changed files with 682 additions and 681 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@
 * Fixed: Removed Windows Server 2016 DC/MS R1V9 from processed STIGs folder
 * Fixed [#718](https://github.com/microsoft/PowerStig/issues/718): Allow application of applicable user rights assignments for non-domain and disconnected systems
 * Fixed [#731](https://github.com/microsoft/PowerStig/issues/731): Update Windows 10 Client Org Default Setting For Rule V-63405 to "15"
+* Fixed [#735](https://github.com/microsoft/PowerStig/issues/735): Rule V-63353 won't reach desired state if system partition is Fat32
 
 ## [4.4.2] - 2020-07-06
 

diff --git a/Tests/Integration/Module/AuditSettingRule.Integration.tests.ps1 b/Tests/Integration/Module/AuditSettingRule.Integration.tests.ps1
@@ -6,7 +6,7 @@ try
 {
     $rulesToTest = @(
             @{
-                query        = "SELECT * FROM Win32_Volume WHERE DriveType = '3'"
+                query        = "SELECT * FROM Win32_Volume WHERE DriveType = '3' AND SystemVolume != 'True'"
                 property     = 'FileSystem'
                 desiredvalue = 'NTFS|ReFS'
                 operator     = '-match'

diff --git a/Tests/Unit/Module/AuditSettingRule.tests.ps1 b/Tests/Unit/Module/AuditSettingRule.tests.ps1
@@ -8,7 +8,7 @@ try
         #region Test Setup
         $testRuleList = @(
             @{
-                Query = "SELECT * FROM Win32_Volume WHERE DriveType = '3'"
+                Query = "SELECT * FROM Win32_Volume WHERE DriveType = '3' AND SystemVolume != 'True'"
                 Property = 'FileSystem'
                 DesiredValue = 'NTFS|ReFS'
                 Operator = '-match'

diff --git a/source/Module/Rule.AuditSetting/Convert/AuditSettingRule.Convert.psm1 b/source/Module/Rule.AuditSetting/Convert/AuditSettingRule.Convert.psm1
@@ -67,7 +67,7 @@ class AuditSettingRuleConvert : AuditSettingRule
             {$PSItem -Match "Disk Management"}
             {
                 Write-Verbose "[$($MyInvocation.MyCommand.Name)] File System Type"
-                $this.Query = "SELECT * FROM Win32_Volume WHERE DriveType = '3'"
+                $this.Query = "SELECT * FROM Win32_Volume WHERE DriveType = '3' AND SystemVolume != 'True'"
                 $this.Property = 'FileSystem'
                 $this.Operator = '-match'
                 if ($PSItem -Match "Cluster Share Volumes")

diff --git a/source/StigData/Processed/WindowsClient-10-1.21.xml b/source/StigData/Processed/WindowsClient-10-1.21.xml
@@ -1025,7 +1025,7 @@ v1809 (Build 17763)</RawString>
       <OrganizationValueRequired>False</OrganizationValueRequired>
       <OrganizationValueTestString />
       <Property>FileSystem</Property>
-      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3'</Query>
+      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3' AND SystemVolume != 'True'</Query>
       <RawString>Run "Computer Management".
 Navigate to Storage &gt;&gt; Disk Management.
 

diff --git a/source/StigData/Processed/WindowsClient-10-1.23.xml b/source/StigData/Processed/WindowsClient-10-1.23.xml
@@ -1024,7 +1024,7 @@ v1809 (Build 17763)</RawString>
       <OrganizationValueRequired>False</OrganizationValueRequired>
       <OrganizationValueTestString />
       <Property>FileSystem</Property>
-      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3'</Query>
+      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3' AND SystemVolume != 'True'</Query>
       <RawString>Run "Computer Management".
 Navigate to Storage &gt;&gt; Disk Management.
 

diff --git a/source/StigData/Processed/WindowsServer-2012R2-DC-2.19.xml b/source/StigData/Processed/WindowsServer-2012R2-DC-2.19.xml
diff --git a/source/StigData/Processed/WindowsServer-2012R2-DC-2.21.xml b/source/StigData/Processed/WindowsServer-2012R2-DC-2.21.xml
@@ -1039,7 +1039,7 @@ Windows 2012 - any release candidates or versions prior to the initial release.<
       <OrganizationValueRequired>False</OrganizationValueRequired>
       <OrganizationValueTestString />
       <Property>FileSystem</Property>
-      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3'</Query>
+      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3' AND SystemVolume != 'True'</Query>
       <RawString>Open "Computer Management".
 
 Select "Disk Management" under "Storage".
@@ -3531,7 +3531,7 @@ Viewing in File Explorer:
 For each folder, view the Properties.
 Select the "Security" tab, and the "Advanced" button.
 Default Permissions:
-\Program Files 
+\Program Files
 Type - "Allow" for all
 Inherited from - "None" for all
 Principal - Access - Applies to

diff --git a/source/StigData/Processed/WindowsServer-2012R2-MS-2.17.xml b/source/StigData/Processed/WindowsServer-2012R2-MS-2.17.xml
@@ -844,7 +844,7 @@ Windows 2012 - any release candidates or versions prior to the initial release.<
       <OrganizationValueRequired>False</OrganizationValueRequired>
       <OrganizationValueTestString />
       <Property>FileSystem</Property>
-      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3'</Query>
+      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3' AND SystemVolume != 'True'</Query>
       <RawString>Open "Computer Management".
 
 Select "Disk Management" under "Storage".
@@ -2535,7 +2535,7 @@ Viewing in File Explorer:
 For each folder, view the Properties.
 Select the "Security" tab, and the "Advanced" button.
 Default Permissions:
-\Program Files 
+\Program Files
 Type - "Allow" for all
 Inherited from - "None" for all
 Principal - Access - Applies to

diff --git a/source/StigData/Processed/WindowsServer-2012R2-MS-2.19.xml b/source/StigData/Processed/WindowsServer-2012R2-MS-2.19.xml
@@ -844,7 +844,7 @@ Windows 2012 - any release candidates or versions prior to the initial release.<
       <OrganizationValueRequired>False</OrganizationValueRequired>
       <OrganizationValueTestString />
       <Property>FileSystem</Property>
-      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3'</Query>
+      <Query>SELECT * FROM Win32_Volume WHERE DriveType = '3' AND SystemVolume != 'True'</Query>
       <RawString>Open "Computer Management".
 
 Select "Disk Management" under "Storage".
@@ -2537,7 +2537,7 @@ Viewing in File Explorer:
 For each folder, view the Properties.
 Select the "Security" tab, and the "Advanced" button.
 Default Permissions:
-\Program Files 
+\Program Files
 Type - "Allow" for all
 Inherited from - "None" for all
 Principal - Access - Applies to