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

Need a test to verify the conversionstatus="fail" does not exist in processed STIGs #550

Merged
merged 4 commits into from
Dec 6, 2019
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

* Update PowerSTIG parsing for IIS 8.5 STIG - Ver 1, Rel 9 [#530](https://github.com/microsoft/PowerStig/issues/530)
* Fixed [#428](https://github.com/microsoft/PowerStig/issues/428): Updated JRE rule V-66941.a to be a Organizational setting
* Update PowerSTIG parsing for IIS 8.5 STIG - Ver 1, Rel 9 [#530] (https://github.com/microsoft/PowerStig/issues/530)
* Fixed [#427](https://github.com/microsoft/PowerStig/issues/427): Windows 10 Rule V-63373 fails to apply settings to system drive
Expand All @@ -12,6 +13,7 @@
* Update PowerSTIG to successfully parse Mozilla Firefox STIG - Ver 4, Rel 27: [#540](https://github.com/microsoft/PowerStig/issues/540)
* Update PowerSTIG to successfully parse Microsoft Windows 10 STIG - Ver 1, Rel 19: [533](https://github.com/microsoft/PowerStig/issues/533)
* Update PowerSTIG to parse/convert the Windows Server 2012 R2 MS/DC V2R17/V2R18 Respectively: [531](https://github.com/microsoft/PowerStig/issues/531)
* Need a test to verify the conversionstatus="fail" does not exist in processed STIGs: [545](https://github.com/microsoft/PowerStig/issues/545)
* Update PowerSTIG to successfully parse Microsoft SQL Server 2016 Instance STIG - Ver 1, Rel 7: [#542](https://github.com/microsoft/PowerStig/issues/542)

## 4.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ V-73591::Registry Path: \SOFTWARE\ Policies\Microsoft\Windows\PowerShell\ScriptB
V-73551::Value: 0x00000000 (0) (Security), 0x00000001 (1) (Basic)::Value: 0x00000000 (0) (Security) or 0x00000001 (1) (Basic)
V-73711::Value: 0x00000002 (2) (Prompt for consent on the secure desktop)::Value: 1 or 2
V-73755::Passwords for application accounts with this user right must be protected as highly privileged accounts.::""
V-73375::*::''
V-73377::*::''
V-73391::*::''
V-73393::*::''
V-73395::*::''
V-73397::*::''
V-73399::*::''
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ V-73551::Value: 0x00000000 (0) (Security), 0x00000001 (1) (Basic)::Value: 0x0000
V-73711::Value: 0x00000002 (2) (Prompt for consent on the secure desktop)::Value: 1 or 2
V-73755::Passwords for application accounts with this user right must be protected as highly privileged accounts.::""
V-73375::*::''
V-73377::*::''
V-73391::*::''
V-73393::*::''
V-73395::*::''
V-73397::*::''
V-73399::*::''
2,470 changes: 1,030 additions & 1,440 deletions StigData/Processed/WindowsServer-2016-DC-1.8.xml

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions StigData/Processed/WindowsServer-2016-DC-1.9.org.default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
<OrganizationalSetting id="V-73367" PolicyValue="5" />
<!-- Ensure ''V-73513.b'' -match '1|3'-->
<OrganizationalSetting id="V-73513.b" ValueData="1" />
<!-- Ensure ''V-73517'' -match '1|2'-->
<OrganizationalSetting id="V-73517" ValueData="3" />
<!-- Ensure ''V-73521'' -match '1|3|8|ShouldBeAbsent'-->
<OrganizationalSetting id="V-73521" ValueData="8" />
<!-- Ensure ''V-73551'' -match '0|1'-->
Expand Down
2,096 changes: 900 additions & 1,196 deletions StigData/Processed/WindowsServer-2016-DC-1.9.xml

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions StigData/Processed/WindowsServer-2016-MS-1.9.org.default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<OrganizationalSettings fullversion="1.9">
<!-- Ensure ''V-73513.b'' -match '1|3'-->
<OrganizationalSetting id="V-73513.b" ValueData="1" />
<!-- Ensure ''V-73517'' -match '1|2'-->
<OrganizationalSetting id="V-73517" ValueData="3" />
<!-- Ensure ''V-73521'' -match '1|3|8|ShouldBeAbsent'-->
<OrganizationalSetting id="V-73521" ValueData="8" />
<!-- Ensure ''V-73551'' -match '0|1'-->
Expand Down
8 changes: 7 additions & 1 deletion Tests/Unit/Module/STIG.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ try
It "Should return $($sample.TechnologyVersion) as the TechnologyVersion property" {
$benchmarkId.TechnologyVersion | Should Be $sample.TechnologyVersion
}

It "Should return $($sample.TechnologyRole) as the TechnologyRole property" {

$benchmarkId.TechnologyRole | Should Be $sample.TechnologyRole
Expand All @@ -250,6 +250,12 @@ try
}
}
}
Describe 'Conversion Status' {
It 'Should not contain conversionstatus="fail" in any processed STIG' {
$selectStringResults = Select-String -Pattern 'conversionstatus="fail"' -Path "$PSScriptRoot\..\..\..\StigData\Processed\*.xml"
$selectStringResults | Should Be $null
}
}
#endregion
}
finally
Expand Down