Need a test to verify the conversionstatus="fail" does not exist in p…

…rocessed STIGs (#550) * updated Win2016DC failed converts and added tests * removed V-73517 from MS-1.9 as the rule no longer exist.
microsoft · Dec 6, 2019 · 583fbc6 · 583fbc6
1 parent 9270c1a
commit 583fbc6
Show file tree

Hide file tree

Showing 8 changed files with 1,952 additions and 2,641 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
@@ -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

diff --git a/StigData/Archive/Windows.Server.2016/U_MS_Windows_Server_2016_DC_STIG_V1R8_Manual-xccdf.log b/StigData/Archive/Windows.Server.2016/U_MS_Windows_Server_2016_DC_STIG_V1R8_Manual-xccdf.log
@@ -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::*::''
diff --git a/StigData/Archive/Windows.Server.2016/U_MS_Windows_Server_2016_DC_STIG_V1R9_Manual-xccdf.log b/StigData/Archive/Windows.Server.2016/U_MS_Windows_Server_2016_DC_STIG_V1R9_Manual-xccdf.log
@@ -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::*::''
diff --git a/StigData/Processed/WindowsServer-2016-DC-1.8.xml b/StigData/Processed/WindowsServer-2016-DC-1.8.xml
diff --git a/StigData/Processed/WindowsServer-2016-DC-1.9.org.default.xml b/StigData/Processed/WindowsServer-2016-DC-1.9.org.default.xml
@@ -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'-->

diff --git a/StigData/Processed/WindowsServer-2016-DC-1.9.xml b/StigData/Processed/WindowsServer-2016-DC-1.9.xml
diff --git a/StigData/Processed/WindowsServer-2016-MS-1.9.org.default.xml b/StigData/Processed/WindowsServer-2016-MS-1.9.org.default.xml
@@ -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'-->

diff --git a/Tests/Unit/Module/STIG.tests.ps1 b/Tests/Unit/Module/STIG.tests.ps1
@@ -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
@@ -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