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.

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

updated to not include system drives #736

Merged
merged 1 commit into from
Sep 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Tests/Unit/Module/AuditSettingRule.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion source/StigData/Processed/WindowsClient-10-1.21.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion source/StigData/Processed/WindowsClient-10-1.23.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
478 changes: 239 additions & 239 deletions source/StigData/Processed/WindowsServer-2012R2-DC-2.19.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions source/StigData/Processed/WindowsServer-2012R2-DC-2.21.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/StigData/Processed/WindowsServer-2012R2-MS-2.17.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/StigData/Processed/WindowsServer-2012R2-MS-2.19.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down Expand Up @@ -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
Expand Down
Loading